diff --git a/ChangeLog b/ChangeLog
index 9e4c218b8..f979db8b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1998-08-19  Martin Baulig  <martin@home-of-linux.org>
 
+	* Makefile.am: Conditionally compiling `control-center' if
+	we have ORBit.
+
 	* Makefile.am: Using $(always_built_SUBDIRS),
 	$(sometimes_built_SUBDIRS) and correct $(DIST_SUBDIRS).
 
diff --git a/Makefile.am b/Makefile.am
index a54146aac..6c901f3b1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,15 @@ if PROGRAM_GMENU
 gmenu = gmenu
 endif
 
+if ORBIT_INSTALLED
+control_center = control-center
+endif
+
 always_built_SUBDIRS = panel applets \
 	 gsm pixmaps desktop-links desktop-properties help-browser \
-	 gnome-terminal core-docs control-center
+	 gnome-terminal core-docs
 
-sometimes_built_SUBDIRS = gmenu smproxy
+sometimes_built_SUBDIRS = gmenu smproxy control_center
 
 SUBDIRS = intl po macros $(always_built_SUBDIRS) $(gmenu)