diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index d38ac75e9501e130aca3046fb114796a0a27ddf1..1b9a506e15d59f32a02520e7f14ae492e753eaca 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* configure.ac (--enable-objc-gc): If not given, default to
+	enable_objc_gc=no.
+	* configure: Regenerated.
+
 2016-11-30  Matthias Klose  <doko@ubuntu.com>
 
 	* configure.ac (--enable-objc-gc): Allow to configure with a
@@ -5,8 +11,8 @@
 	* configure: Regenerate.
 	* Makefile.in (OBJC_BOEHM_GC_LIBS): Get value from configure.
 	* gc.c: Include system bdw-gc headers.
-	* memory.c: Likewise
-	* objects.c: Likewise
+	* memory.c: Likewise.
+	* objects.c: Likewise.
 
 2016-11-15  Matthias Klose  <doko@ubuntu.com>
 
diff --git a/libobjc/configure b/libobjc/configure
index 43a68de99774231344e7dc0902da580c5261f814..251ad6b723d3368a76ba282319ac8360b1f471b7 100755
--- a/libobjc/configure
+++ b/libobjc/configure
@@ -11509,6 +11509,8 @@ $as_echo "#define HAVE_BITFIELD_TYPE_MATTERS 1" >>confdefs.h
 # Check whether --enable-objc-gc was given.
 if test "${enable_objc_gc+set}" = set; then :
   enableval=$enable_objc_gc;
+else
+  enable_objc_gc=no
 fi
 
 
diff --git a/libobjc/configure.ac b/libobjc/configure.ac
index 0497836a964ee8d880a1c933c144f56234aa7456..89075c2fcfdf1a40792ef1e11469ea89be1982e7 100644
--- a/libobjc/configure.ac
+++ b/libobjc/configure.ac
@@ -203,7 +203,7 @@ gt_BITFIELD_TYPE_MATTERS
 AC_ARG_ENABLE(objc-gc,
 [AS_HELP_STRING([--enable-objc-gc],
 		[enable use of Boehm's garbage collector with the
-		 GNU Objective-C runtime])])
+		 GNU Objective-C runtime])],,enable_objc_gc=no)
 AC_ARG_WITH([target-bdw-gc],
 [AS_HELP_STRING([--with-target-bdw-gc=PATHLIST],
 		[specify prefix directory for installed bdw-gc package.