diff --git a/ChangeLog b/ChangeLog
index 2e29b7d2d7..71fed8f741 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-21  Florian Weimer  <fweimer@redhat.com>
+
+	* Makeconfig (all-object-suffixes): Include .op only if
+	$(build-profile).
+
 2016-09-21  Florian Weimer  <fweimer@redhat.com>
 
 	* elf/sln.c: Remove HAVE_CONFIG_H, S_ISDIR, S_ISLNK preprocessor
diff --git a/Makeconfig b/Makeconfig
index c1ce74b4b4..a7858607b0 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -905,7 +905,8 @@ endif
 # The compilation rules use $(CPPFLAGS-${SUFFIX}) and $(CFLAGS-${SUFFIX})
 # to pass different flags for each flavor.
 libtypes = $(foreach o,$(object-suffixes-for-libc),$(libtype$o))
-all-object-suffixes := .o .os .op .oS
+# .op may be added to all-object-suffixes below.
+all-object-suffixes := .o .os .oS
 object-suffixes :=
 CPPFLAGS-.o = $(pic-default)
 CFLAGS-.o = $(filter %frame-pointer,$(+cflags))
@@ -930,6 +931,7 @@ PIE-ccflag = -fPIE
 ifeq (yes,$(build-profile))
 # Under --enable-profile, we will build a static library of profiled objects.
 # The profiled object files are named foo.op.
+all-object-suffixes += .op
 object-suffixes += .op
 CPPFLAGS-.op = -DPROF $(pic-default)
 CFLAGS-.op = -pg