diff --git a/debian/control b/debian/control
index 3f753f877c6e6759758d45cc11f6fd384d006307..270def1688e7a2dda254b8f661c072fad93d35ff 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: extra
 Maintainer: Stefan Bund <senf-dev@lists.berlios.de>
 Build-Depends: debhelper (>= 5), scons, binutils-dev, libboost-dev, 
 	libboost-test-dev, libboost-date-time-dev, libboost-regex-dev, 
-	doxygen, dia, tidy, xsltproc, graphviz, perl-base
+	doxygen, dia, tidy, xsltproc, graphviz, perl-base, linklint
 Standards-Version: 3.7.2
 Section: libs
 
diff --git a/debian/rules b/debian/rules
index 6acb1d99506897c46f22d63cb7862cec4485901a..f1921e0322aecf04929245d564d7d1e9f30f5953 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,6 +52,8 @@ build-stamp: configure-stamp
 	dh_testdir
 #	# Add here commands to compile the package.
 	scons -j $(CONCURRENCY_LEVEL) default all_docs final=1
+	scons linklint
+	scons fixlinks
 	touch $@
 
 clean:
diff --git a/senfscons/Doxygen.py b/senfscons/Doxygen.py
index e5b7b79d2f153b09551c5ef5f6837aec74804af0..e9d8661373b695e04688896ccf63846e9591b76b 100644
--- a/senfscons/Doxygen.py
+++ b/senfscons/Doxygen.py
@@ -343,7 +343,9 @@ def DoxyEmitter(source, target, env):
       out_dir = data["OUTPUT_DIRECTORY"]
       dir = env.Dir( os.path.join(source[0].dir.abspath, out_dir) )
       dir.sources = source
-      if env.GetOption('clean'): targets.append(dir)
+      if env.GetOption('clean'):
+         targets.append(dir)
+         return (targets, source)
    else:
       out_dir = '.'
 
diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py
index d2a170a4dd63c3aa889514d922a18d6522b3738e..753f6921edad2ec4c8376d376ff586b6d398e1c7 100644
--- a/senfscons/SENFSCons.py
+++ b/senfscons/SENFSCons.py
@@ -350,6 +350,9 @@ def Objects(env, sources, testSources = None, LIBS = [], OBJECTS = []):
     return objects
 
 def InstallIncludeFiles(env, files):
+    # Hrmpf ... why do I need this in 0.97??
+    if env.GetOption('clean'):
+        return
     target = env.Dir(env['INCLUDEINSTALLDIR'])
     base = env.Dir(env['INSTALL_BASE'])
     for f in files: