diff --git a/packaging/debian/control b/packaging/debian/control
index e81e9ce8f4841c13e49ce49434ba7ab41554c917..e7cad0f86069910877c3e9fefc4a0fdfbb722017 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -3,7 +3,7 @@ Section: interpreters
 Priority: optional
 Maintainer: Marek Habersack <grendel@debian.org>
 Standards-Version: 3.6.2.1
-Build-Depends: debhelper (>> 4.0.0), libgdbm-dev, libgmp3-dev, libz-dev, libjpeg-dev, libttf-dev, libmysqlclient10-dev, libreadline-dev, perl, bison, debhelper, freeglut3-dev (>= 2.2.0-6.1) [alpha hppa] | libglut3-dev, freeglut3-dev [!alpha !hppa] | libglut3-dev, xlibmesa-glu-dev | libglu-dev, xlibmesa-gl-dev | libgl-dev, libxpm4-dev, gnome-devel, libgtkxmhtml-dev, libfreetype6-dev, autoconf, libiodbc2-dev, libsane-dev, postgresql-dev, librsvg2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, libperl-dev, sharutils, libpng3-dev, gtkglarea5-dev, libtiff3g-dev,  bc, libpcre3-dev, libbz2-dev, libnettle-dev, libsqlite3-dev, libfuse-dev, libhowl-dev
+Build-Depends: debhelper (>> 4.0.0), libgdbm-dev, libgmp3-dev, libz-dev, libjpeg-dev, libttf-dev, libmysqlclient10-dev, libreadline-dev, perl, bison, debhelper, freeglut3-dev (>= 2.2.0-6.1) [alpha hppa] | libglut3-dev, freeglut3-dev [!alpha !hppa] | libglut3-dev, xlibmesa-glu-dev | libglu-dev, xlibmesa-gl-dev | libgl-dev, libxpm-dev, gnome-devel, libgtkxmhtml-dev, libfreetype6-dev, autoconf, libiodbc2-dev, libsane-dev, postgresql-dev, librsvg2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, libperl-dev, sharutils, libpng3-dev, gtkglarea5-dev, libtiff4-dev,  bc, libpcre3-dev, libbz2-dev, libnettle-dev, libsqlite3-dev, libfuse-dev, libhowl-dev, libglade0-dev, fftw3-dev
 Build-Conflicts: libutahglx-dev
 
 Package: pike7.7-core
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 72e309f640b428d58c68d33276aa1f47277c952a..3e85ad689d08ba552c6b0b293393601392c7a4db 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -6,7 +6,7 @@
 # architecture-dependant package, as well as an architecture-independent
 # package.
 #
-# $Id: rules,v 1.51 2005/09/03 01:37:40 grendel Exp $
+# $Id: rules,v 1.52 2005/09/03 02:41:41 grendel Exp $
 #
 
 # Uncomment this to turn on verbose mode. 
@@ -21,7 +21,12 @@ else
 CC=gcc
 endif
 
+ifeq (,$(DEB_BUILD_ARCH))
+DEB_BUILD_ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+endif
+
 CFLAGS = -DDEBIAN
+CPPFLAGS =  -I/usr/include/howl
 
 ifdef SSP
 SSP_FLAGS=-fstack-protector
@@ -77,9 +82,7 @@ endif
 # These are on so that people can report problems with them
 #
 EXPERIMENTAL_CFARGS=--with-computed-goto \
-                    --with-small-eval-instruction \
-		    --with-keypair-loop \
-		    --without-lock
+		    --with-keypair-loop
 
 VERSION:=$(shell dpkg-parsechangelog | grep ^Version | sed -e 's/Version: //;s/-[^-]*$$//')
 OS=$(shell uname -srm|sed -e 's/ /-/g'|tr '[A-Z]' '[a-z]'|tr '/' '_')
@@ -87,11 +90,11 @@ BUILDDIR=build/$(OS)
 CFARGS=$(CFARGSEXTRA) \
        $(EXPERIMENTAL_CFARGS) \
        --disable-rpath \
-       --enable-pikelib \
        --disable-smartlink-binary \
        --with-relocatable-dumped-modules \
        --without-bundles \
        --with-cflags="$(CFLAGS)" \
+       --with-cppflags="$(CPPFLAGS)" \
        --with-bignums \
        --with-gmp \
        --with-poll \
@@ -110,7 +113,6 @@ CFARGS=$(CFARGSEXTRA) \
        --with-perl \
        --without-ffmpeg \
        --without-libpdf \
-       --without-GTK \
        --with-GTK2 \
        --with-sqlite \
        --without-libpanda $(MACHINE_OPTS) $(EXTRA_ARGS)
@@ -120,7 +122,7 @@ RUNPIKE2=$(CURDIR)/debian/$(PIKE)-core/usr/bin/pike -m$(CURDIR)/$(BUILDDIR)/lib/
 PIKE_FAKEROOT=$(CURDIR)/debian/$(PIKE)-core
 PIKE_FAKEROOT_OMIT=$(BUILDDIR)*:$(CURDIR)/lib*:$(CURDIR)/src*:$(CURDIR)/bin*:$(CURDIR)/man*:$(BUILDDIR)/lib*:$(CURDIR)*:$(CURDIR)/debian/$(PIKE)-core*
 
-export CFLAGS CC PIKE VERSION
+export CFLAGS CC PIKE VERSION CPPFLAGS
 
 configure: configure-stamp
 configure-stamp:
diff --git a/src/modules/_Protocols_DNS_SD/configure.in b/src/modules/_Protocols_DNS_SD/configure.in
index d2b9ac503559cc83594de6cc916b073c41a593e5..93797a0b53babdf37184b6a6df9245bd2aed7181 100644
--- a/src/modules/_Protocols_DNS_SD/configure.in
+++ b/src/modules/_Protocols_DNS_SD/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.1 2005/04/09 21:07:21 jonasw Exp $
+# $Id: configure.in,v 1.2 2005/09/03 02:41:41 grendel Exp $
 
 AC_INIT(sd.c)
 AC_CONFIG_HEADER(config.h)
@@ -21,9 +21,9 @@ if test x$with_dnssd = xyes ; then
   elif test x$ac_cv_header_howl_h = xyes; then
     PIKE_FEATURE(DNS-SD,[no (libhowl not found)])
     AC_DEFINE(HAVE_HOWL)
-    AC_CHECK_LIB(libhowl, sw_discovery_init, [
+    AC_CHECK_LIB(howl, sw_discovery_init, [
       PIKE_FEATURE(DNS-SD,[yes (howl.h)])
-      LIBS="{$LIBS-} -llibhowl"
+      LIBS="{$LIBS-} -lhowl"
     ])
   fi
 fi
diff --git a/src/opcodes.c b/src/opcodes.c
index f7d65353a68051d9c4936330171a2089fe88a5ee..d7100796962bd90f24a9ad235d90342e16222010 100644
--- a/src/opcodes.c
+++ b/src/opcodes.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: opcodes.c,v 1.166 2004/12/30 13:41:08 grubba Exp $
+|| $Id: opcodes.c,v 1.167 2005/09/03 02:41:41 grendel Exp $
 */
 
 #include "global.h"
@@ -325,7 +325,7 @@ const char *get_f_name(int n)
 }
 
 #ifdef HAVE_COMPUTED_GOTO
-char *get_opcode_name(PIKE_INSTR_T n)
+const char *get_opcode_name(PIKE_INSTR_T n)
 {
   int fcode;
   int low = 0;