diff --git a/ChangeLog b/ChangeLog
index 09cfb9783ccb34d7b99c3952d24625f81a3ffbd7..560f60a181958f03378842f2a611f474a3a94f4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-09-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port --without-x --enable-gcc-warnings to Fedora 19.
+	* configure.ac (WERROR_CFLAGS): Omit redundant use of
+	-Wmissing-field-initializers, -Wswitch, -Wtype-limits,
+	-Wunused-parameter.  If there is no window system, also omit
+	-Wsuggest-attribute=const and -Wsuggest-attribute=noreturn; this
+	is needed for Fedora 19.
+
 2013-09-05  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	Make --without-x compatible with --enable-gcc-warnings.
diff --git a/configure.ac b/configure.ac
index cfec49e5645e175d94b8561ac61b26a0753d514b..c7cdc01e3e73a8df1cdcdf9cd36fdd8fb6cf98f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -826,6 +826,13 @@ else
   # The following line should be removable at some point.
   nw="$nw -Wsuggest-attribute=pure"
 
+  # This part is merely for shortening the command line,
+  # since -Wno-FOO needs to be added below regardless.
+  nw="$nw -Wmissing-field-initializers"
+  nw="$nw -Wswitch"
+  nw="$nw -Wtype-limits"
+  nw="$nw -Wunused-parameter"
+
   # clang is unduly picky about some things.
   AC_CACHE_CHECK([whether the compiler is clang], [emacs_cv_clang],
     [AC_COMPILE_IFELSE(
@@ -1777,6 +1784,11 @@ fi
 
 if test "$window_system" = none && test "$gl_gcc_warnings" = yes; then
    # Too many warnings for now.
+   nw=
+   nw="$nw -Wsuggest-attribute=const"
+   nw="$nw -Wsuggest-attribute=noreturn"
+   gl_MANYWARN_COMPLEMENT([WARN_CFLAGS], [$WARN_CFLAGS], [$nw])
+
    gl_WARN_ADD([-Wno-unused-variable])
    gl_WARN_ADD([-Wno-unused-but-set-variable])
    gl_WARN_ADD([-Wno-unused-but-set-parameter])
diff --git a/src/ChangeLog b/src/ChangeLog
index 7f41abc46bbda2cc4a8a44e785e63bdc71d349c0..7f4c3f731f4a8ae4bd68ddaa64dde508958ee8bb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port --without-x --enable-gcc-warnings to Fedora 19.
+	* gfilenotify.c (globals_of_gfilenotify):
+	Call g_type_init only if using an older glib version that needs it.
+
 2013-09-06  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	* lisp.h (last_glyphless_glyph_frame, last_glyphless_glyph_face_id)
diff --git a/src/gfilenotify.c b/src/gfilenotify.c
index 8f13c72df81d0dd7dd3751b9889cb90e16df5c43..7415c3a24135ab7de5de4b7b25833b094191e7bc 100644
--- a/src/gfilenotify.c
+++ b/src/gfilenotify.c
@@ -249,7 +249,9 @@ WATCH-DESCRIPTOR should be an object returned by `gfile-add-watch'.  */)
 void
 globals_of_gfilenotify (void)
 {
+#if ! GLIB_CHECK_VERSION (2, 36, 0)
   g_type_init ();
+#endif
   watch_list = Qnil;
 }