diff --git a/Jamfile b/Jamfile
index 38bbb2a..130f2bf 100644
--- a/Jamfile
+++ b/Jamfile
@@ -16,7 +16,7 @@ Clean distclean : $(JCACHEFILE) $(HCACHEFILE) ;
 
 # SubInclude goes after local rules
 SubInclude TOP ede-about ;
-SubInclude TOP ede-autostart;
+SubInclude TOP ede-autostart ;
 SubInclude TOP ede-bell-conf ;
 SubInclude TOP ede-bug-tools ;
 SubInclude TOP ede-calc ;
diff --git a/ede-autostart/Jamfile b/ede-autostart/Jamfile
index d6e8304..bc94058 100644
--- a/ede-autostart/Jamfile
+++ b/ede-autostart/Jamfile
@@ -8,7 +8,7 @@
 # GNU General Public License version 2 or newer.
 # See COPYING for details.
 
-SubDir TOP ede-autostart;
+SubDir TOP ede-autostart ;
 
 EdeProgram ede-autostart : ede-autostart.cpp ;
 #ObjectC++Flags ede-autostart : -DDEBUG_AUTOSTART_RUN ;
diff --git a/evoke/ede-autostart.cpp b/ede-autostart/ede-autostart.cpp
similarity index 100%
rename from evoke/ede-autostart.cpp
rename to ede-autostart/ede-autostart.cpp
diff --git a/evoke/icons/warning.xpm b/ede-autostart/icons/warning.xpm
similarity index 100%
rename from evoke/icons/warning.xpm
rename to ede-autostart/icons/warning.xpm
diff --git a/evoke/Jamfile b/evoke/Jamfile
index 535e5b9..40c8f87 100644
--- a/evoke/Jamfile
+++ b/evoke/Jamfile
@@ -34,9 +34,6 @@ ObjectC++Flags ede-shutdown : $(X_CFLAGS) ;
 ProgramBare    ede-shutdown : ede-shutdown.cpp ; 
 LinkAgainst    ede-shutdown : $(X_LIBS) -lX11 ;
 
-EdeProgram ede-autostart : ede-autostart.cpp ;
-#ObjectC++Flags ede-autostart : -DDEBUG_AUTOSTART_RUN ;
-
 InstallEdeProgram ede-settings-apply ;
 
 EdeManualWithToc [ FFileName doc evoke.txt ] ;