2 files changed, 5 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index f6f13a6..3db1766 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \
     noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers noncore/appskey noncore/qpdf \
     noncore/kpacman noncore/advancedfm noncore/kbill noncore/remote noncore/opie-sh
 
-NONTMAKEAPPS := noncore/nethack
+NONTMAKEAPPS := ipaq/opiealarm noncore/nethack
 
 DOCS = docs/src/opie-policy
 single: mpegplayer/libmpeg3
diff --git a/mkipks b/mkipks
index 2259221..b3f87c8 100755
--- a/mkipks
+++ b/mkipks
@@ -8,6 +8,9 @@ mkdir -p etc/rc2.d
 rm -f etc/rc2.d/S98qpe
 ln -s ../init.d/qpe etc/rc2.d/S98qpe
 
+rm -f ipaq/etc/rc2.d/S96opieatd
+ln -s ../init.d/opieatd ipaq/etc/rc2.d/S96opieatd
+
 VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
 VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
 VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h)
@@ -192,7 +195,7 @@ do
             echo "Depends: $depends" >>$CTRLDIR/control
             echo "Provides: $provides" >>$CTRLDIR/control
             echo "Conflicts: $conflicts" >>$CTRLDIR/control
-            egrep -v "^(Files|Version|Depends):" >>$CTRLDIR/control $i
+            egrep -v "^(Files|Version|Depends|Provides|Conflicts):" >>$CTRLDIR/control $i
             echo "$DEB_VERSION" >$TDIR/debian-binary
             base=${i%.control}
             scripts="preinst postinst prerm postrm"