diff --git a/clisp.spec b/clisp.spec
index 137b369..11f8ba2 100644
--- a/clisp.spec
+++ b/clisp.spec
@@ -49,6 +49,7 @@ Patch16:        clisp-db6.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global vimdir  %{_datadir}/vim/site/after/syntax
+BuildRequires:  FastCGI-devel
 BuildRequires:  db-devel
 BuildRequires:  dbus-1-devel
 BuildRequires:  fdupes
@@ -165,6 +166,11 @@ case "$(uname -m)" in
     axp|alpha)
 	    CC="${CC}"				;;
 esac
+#
+# FastCGI-devel seems a bit broken
+#
+CC="${CC} -I%{_includedir}/fastcgi"
+
 safety='-O'
 MYCFLAGS="$(getconf LFS_CFLAGS)"
 if grep -q _DEFAULT_SOURCE /usr/include/features.h
@@ -178,15 +184,15 @@ port=''
 case "$(uname -m)" in
     i[0-9]86)
             MYCFLAGS="${MYCFLAGS}"				;;
-    arm*)   MYCFLAGS="${MYCFLAGS}"				;;
-    aarch64)MYCFLAGS="${MYCFLAGS}"				;;
+    arm*)   MYCFLAGS="${MYCFLAGS} -DSAFETY=3"				;;
+    aarch64)MYCFLAGS="${MYCFLAGS} -DSAFETY=3"				;;
     ppc)    MYCFLAGS="${MYCFLAGS}"				;;
     s390)   MYCFLAGS="${MYCFLAGS}"				;;
     x86_64) MYCFLAGS="${MYCFLAGS}"				;;
     sparc*) MYCFLAGS="${MYCFLAGS} ${safety}"			;;
     ppc64)  MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD"	;;
     ppc64le)MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD"	;;
-    s390x)  MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD"	;;
+    s390x)  MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD -DSAFETY=3"	;;
     ia64)   MYCFLAGS="${MYCFLAGS} ${safety}"			;;
     axp|alpha)
 	    MYCFLAGS="${MYCFLAGS}"				;;
@@ -251,8 +257,9 @@ tail -q -s 0.5 -f $SCREENLOG & pid=$!
     --with-dynamic-modules      \
     --with-gettext		\
     --with-module=asdf		\
-    --with-module=editor	\
     --with-module=dbus		\
+    --with-module=editor	\
+    --with-module=fastcgi	\
     --with-module=queens	\
     --with-module=gdbm		\
     --with-module=gtk2		\