diff --git a/ChangeLog b/ChangeLog
index f979db8b8..7aacfc560 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1998-08-19  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* Makefile.am (SUBDIRS): Actually compile `control-center' if
+	it is enabled.
+	(always_built_SUBDIRS): Reinstate `smproxy'.
+
 1998-08-19  Martin Baulig  <martin@home-of-linux.org>
 
 	* Makefile.am: Conditionally compiling `control-center' if
diff --git a/Makefile.am b/Makefile.am
index 65e944ed4..4c6a46132 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,15 +7,15 @@ control_center = control-center
 endif
 
 always_built_SUBDIRS = panel applets \
-	 gsm pixmaps desktop-links desktop-properties help-browser \
+	 gsm smproxy pixmaps desktop-links desktop-properties help-browser \
 	 gnome-terminal core-docs
 
-sometimes_built_SUBDIRS = gmenu smproxy control-center
+sometimes_built_SUBDIRS = gmenu control-center
 
-SUBDIRS = intl po macros $(always_built_SUBDIRS) $(gmenu)
+SUBDIRS = intl po macros $(always_built_SUBDIRS) $(gmenu) $(control_center)
 
-DIST_SUBDIRS = intl po macros $(always_built_SUBDIRS) \
-	$(sometimes_built_SUBDIRS)
+#DIST_SUBDIRS = intl po macros $(always_built_SUBDIRS) \
+#	$(sometimes_built_SUBDIRS)
 
 EXTRA_DIST = gnome-core.spec