diff --git a/client/Makefile.am b/client/Makefile.am
index bc37bbf3..61fe439d 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS        = fwknop
 
 fwknop_SOURCES      = fwknop.c fwknop.h config_init.c config_init.h \
                       fwknop_common.h spa_comm.c spa_comm.h utils.c utils.h \
-                      http_resolve_host.c getpasswd.c getpasswd.h
+                      http_resolve_host.c getpasswd.c getpasswd.h cmd_opts.h
 
 fwknop_CPPFLAGS     = -I $(top_srcdir)/lib -I $(top_srcdir)/common
 
diff --git a/fwknop.spec b/fwknop.spec
index dfa779c9..683b8989 100644
--- a/fwknop.spec
+++ b/fwknop.spec
@@ -91,8 +91,10 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -D ./extras/fwknop.init.redhat ${RPM_BUILD_ROOT}/etc/rc.d/init.d/fwknopd
 # Just in case...
-[ ! -d "${RPM_BUILD_ROOT}/usr/share/info" ] \
+[ -d "${RPM_BUILD_ROOT}/usr/share/info" ] \
     || mkdir -p ${RPM_BUILD_ROOT}/usr/share/info
+[ -f "${RPM_BUILD_ROOT}/usr/share/info/dir" ] \
+    || touch ${RPM_BUILD_ROOT}/usr/share/info/dir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/server/Makefile.am b/server/Makefile.am
index d0355ef6..e04e2964 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -10,7 +10,7 @@ fwknopd_SOURCES   = fwknopd.c fwknopd.h config_init.c config_init.h \
                     fw_util.c fw_util.h fw_util_ipf.c fw_util_ipf.h \
                     fw_util_iptables.c fw_util_iptables.h \
                     fw_util_ipfw.c fw_util_ipfw.h \
-                    fw_util_pf.c fw_util_pf.h
+                    fw_util_pf.c fw_util_pf.h cmd_opts.h
 
 fwknopd_LDADD     = $(top_builddir)/lib/libfko.la -lpcap