diff --git a/ChangeLog b/ChangeLog
index 5e599f18b..a79a02435 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-09  Bradford Hovinen  <hovinen@ximian.com>
+
+	* Makefile.am: Added Gnome.directory and installation routine
+
 2001-07-07  Chema Celorio  <chema@celorio.com>
 
 	* configure.in (capplet_modules): add bonobo and bonobox
diff --git a/Gnome.directory b/Gnome.directory
new file mode 100644
index 000000000..4ca403434
--- /dev/null
+++ b/Gnome.directory
@@ -0,0 +1,63 @@
+[Desktop Entry]
+Name=Control Center
+Name[az]=Ýdaræ Mærkæzi
+Name[ca]=Centre de Control
+Name[cs]=Øídící centrum
+Name[da]=Kontrolcenter
+Name[de]=Kontrollzentrum
+Name[el]=ÊÝíôñï ÅëÝã÷ïõ
+Name[en_GB]=Control Centre
+Name[es]=Centro de control
+Name[et]=Juhtpaneel
+Name[fi]=Hallintakeskus
+Name[fr]=Centre de contrôle
+Name[gl]=Centro de control
+Name[hr]=Kontrolni centar
+Name[hu]=Vezérlõpult
+Name[it]=Control Center
+Name[ja]=Control Center
+Name[ko]=Á¶Á¾ ¼¾ÅÍ
+Name[lt]=Valdymo centras
+Name[nl]=Configuratie Centrum
+Name[no]=Kontrollsenter
+Name[pl]=Centrum Sterowania GNOME
+Name[pt]=Centro de Controlo
+Name[pt_BR]=Central de Controle
+Name[ro]=Centrul de control
+Name[ru]=ãÅÎÔÒ ÕÐÒÁ×ÌÅÎÉÑ GNOME
+Name[sk]=Ovládacie centrum
+Name[sl]=Kontrolni center
+Name[sv]=Kontrollpanelen
+Name[tr]=Denetim Masasý
+Name[uk]=ãÅÎÔÒ ËÅÒÕ×ÁÎÎÑ
+Name[wa]=Cente di Contrôle
+Name[zh_CN.GB2312]=¿ØÖÆ̨
+Name[zh_TW.Big5]=±±¨î¥x
+Comment=Control Center Menu
+Comment[ca]=Menú del Centre de Control
+Comment[cs]=Menu Øídícího centra
+Comment[da]=Kontrolcentermenu
+Comment[de]=Menü für Kontrollzentrum
+Comment[es]=Menú del Centro de Control de Gnome
+Comment[et]=Juhtpaneeli menüü
+Comment[fi]=Hallintakeskuksen valikko
+Comment[fr]=Menu du centre de contrôle
+Comment[gl]=Menú do Centro de Control de GNOME
+Comment[hu]=Vezérlõpult menü
+Comment[it]=Menù del Control Center
+Comment[ja]=GNOME ¥³¥ó¥È¥í¡¼¥ë¥»¥ó¥¿¡¼¡¦¥á¥Ë¥å¡¼
+Comment[ko]=Á¶Á¾ÆÇ ¸Þ´º
+Comment[lt]=Valdymo centro meniu
+Comment[no]=Kontrollsenter-meny
+Comment[pl]=Menu Centrum Sterowania
+Comment[pt]=Menu do Centro de Controlo
+Comment[pt_BR]=Menu do Centro de Controle
+Comment[ru]=íÅÎÀ ÃÅÎÔÒÁ ÕÐÒÁ×ÌÅÎÉÑ
+Comment[sk]=Menu ovládacieho centra
+Comment[sl]=Menu kontrolnega centra
+Comment[sv]=Kontrollcentermeny
+Comment[uk]=íÅÎÀ ãÅÎÔÒÕ ËÅÒÕ×ÁÎÎÑ
+Comment[wa]=Menu do cente di contrôle
+Comment[zh_CN.GB2312]=¿ØÖÆ̨ѡµ¥
+Comment[zh_TW.Big5]=±±¨î¥x¿ï³æ
+Type=Directory
diff --git a/Makefile.am b/Makefile.am
index 767227fd6..87afbd90f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,17 @@
 SUBDIRS = archiver capplets root-manager control-center po intl
 
-EXTRA_DIST = control-center.spec.in
-
 dist-hook: control-center.spec
 	cp control-center.spec $(distdir)
+
+ccenterdir      = $(datadir)/control-center/capplets
+paneldir        = $(datadir)/gnome/apps/Settings
+
+Directory_files = \
+	Gnome.directory
+
+install-data-local:
+	$(INSTALL_DATA) $(srcdir)/Gnome.directory $(DESTDIR)$(ccenterdir)/.directory
+
+EXTRA_DIST = \
+	control-center.spec.in			\
+	$(Directory_files)