diff --git a/x11-wm/speedwm/speedwm-1.8.ebuild b/x11-wm/speedwm/speedwm-1.8.ebuild
index 8d2f962..27b1015 100644
--- a/x11-wm/speedwm/speedwm-1.8.ebuild
+++ b/x11-wm/speedwm/speedwm-1.8.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+xinerama savedconfig +savedheaders +ipc +xresources +switcher +dmenu +systray +mouse +media +imlib2 +tcc"
+IUSE="+xinerama +savedconfig +savedheaders +ipc +xresources +switcher +dmenu +systray +mouse +media +imlib2 +tcc"
 
 RDEPEND="
 	media-libs/fontconfig
@@ -110,7 +110,9 @@ src_prepare() {
 	fi
 
 	if use savedconfig; then
-		if [ -e "options.h" ]; then
+		if [ -e "config.h" ]; then
+			restore_config config.h
+		elif [ -e "options.h" ]; then
 			restore_config options.h
 		fi
 	fi
diff --git a/x11-wm/speedwm/speedwm-9999.ebuild b/x11-wm/speedwm/speedwm-9999.ebuild
index 8d2f962..27b1015 100644
--- a/x11-wm/speedwm/speedwm-9999.ebuild
+++ b/x11-wm/speedwm/speedwm-9999.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+xinerama savedconfig +savedheaders +ipc +xresources +switcher +dmenu +systray +mouse +media +imlib2 +tcc"
+IUSE="+xinerama +savedconfig +savedheaders +ipc +xresources +switcher +dmenu +systray +mouse +media +imlib2 +tcc"
 
 RDEPEND="
 	media-libs/fontconfig
@@ -110,7 +110,9 @@ src_prepare() {
 	fi
 
 	if use savedconfig; then
-		if [ -e "options.h" ]; then
+		if [ -e "config.h" ]; then
+			restore_config config.h
+		elif [ -e "options.h" ]; then
 			restore_config options.h
 		fi
 	fi