diff --git a/debian/changelog b/debian/changelog
index e9927084..a22189c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-linkchecker (1.3.1) unstable; urgency=low
+linkchecker-ssl (1.3.1) unstable; urgency=low
 
   * remove CVS files from Debian source package by using cvs-
     buildpackage
diff --git a/debian/control b/debian/control
index 32947330..bb602183 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,20 @@
-Source: linkchecker
-Section: web
+Source: linkchecker-ssl
+Section: non-US/main
 Priority: optional
 Maintainer: Bastian Kleineidam <calvin@debian.org>
-Build-Depends: python2-base, python2-dev, debhelper (>= 3.0.0)
+Build-Depends: python2-base, python2-dev, debhelper (>= 3.0.0), libssl-dev
 Build-Depends-Indep: gettext
 Standards-Version: 3.5.4
 
-Package: linkchecker
-Architecture: all
+Package: linkchecker-ssl
+Architecture: any
 Depends: python2-base
-Suggests: linkchecker-ssl (>= ${Source-Version})
-Description: check HTML documents for broken links
- Features:
+Recommends: linkchecker (>= ${Source-Version})
+Description: HTTPS module for linkchecker
+ Includes the Python module 'linkcheckerssl' to support https://
+ links for LinkChecker.
+ .
+ Linkchecker features:
   o recursive checking
   o multithreaded
   o output can be colored or normal text, HTML, SQL, CSV or a sitemap
diff --git a/debian/rules b/debian/rules
index c0f3ae52..36279acd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,7 @@
 #!/usr/bin/make -f
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
-PACKAGE=linkchecker
-DOCDIR = debian/$(PACKAGE)/usr/share/doc/$(PACKAGE)
+PACKAGE=linkchecker-ssl
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -14,23 +13,40 @@ export DH_COMPAT=3
 export DH_OPTIONS
 
 nossl:
-	@echo already nossl version environments
-
-
-ssl:
-	@echo change to ssl version...
-	@cat debian/changelog | sed '1 s/linkchecker/linkchecker-ssl/' >debian/changelog-ssl
-	@cd debian && for i in *-ssl; do \
-                f=`echo $$i | sed -e 's/-ssl//'`; \
-                mv $$f $$f-nossl; \
+	@echo change to nossl version...
+	@cat debian/changelog | sed '1 s/linkchecker-ssl/linkchecker/' >debian/changelog-nossl
+	@cd debian && for i in *-nossl; do \
+                f=`echo $$i | sed -e 's/-nossl//'`; \
+                mv $$f $$f-ssl; \
                 mv $$i $$f; \
                 echo -n "$$f "; \
         done
 	@chmod +x debian/rules
 	@echo done
 
+ssl:
+	@echo already ssl version environments
 
-include debian/rules.mk
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	./setup.py config -lcrypto
+	touch configure-stamp
+
+
+build: configure-stamp build-stamp
+build-stamp:
+	dh_testdir
+	rm -rf debian/$(PACKAGE) debian/$(PACKAGE)-ssl
+	./setup.py build
+	touch build-stamp
+
+clean:
+	dh_testdir
+	rm -f build-stamp configure-stamp
+	$(MAKE) clean
+	dh_clean
 
 install: build
 	dh_testdir
@@ -38,38 +54,34 @@ install: build
 	dh_installdirs
 	$(MAKE) locale
 	./setup.py install --root=`pwd`/debian/$(PACKAGE) --no-compile
-	# remove man pages, we install them with dh_installman
-	rm -r debian/$(PACKAGE)/usr/man
-	# remove example files, we install them with dh_installexamples
-	rm -r debian/$(PACKAGE)/usr/share/linkchecker/examples/
-	# remove any SSL related files
-	rm -r debian/$(PACKAGE)/usr/lib/python2.0/site-packages/linkcheckssl
-	# install additional doc files
-	install -c -m 644 DNS/README $(DOCDIR)/README_DNS.txt
-	install -c -m 644 test/*.py $(DOCDIR)/test
-	install -c -m 644 test/html/*.html $(DOCDIR)/test/html
-	install -c -m 644 test/output/test_* $(DOCDIR)/test/output
-	# install system wide configuration file in etc
-	mv debian/$(PACKAGE)/usr/share/linkchecker/linkcheckerrc debian/$(PACKAGE)/etc
+	# remove everything but the ssl modules
+	rm -rf debian/$(PACKAGE)/usr/man
+	rm -rf debian/$(PACKAGE)/usr/bin
+	rm -rf debian/$(PACKAGE)/usr/share
+	rm -rf debian/$(PACKAGE)/usr/lib/python2.0/site-packages/{linkcheck,DNS}
+	rm -rf debian/$(PACKAGE)/usr/lib/python2.0/site-packages/*.py
 
 
 # Build architecture-independent files here.
 binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
 	dh_testdir
 	dh_testroot
 #	dh_installdebconf
 	dh_installdocs
-	dh_installexamples lc.* lconline/*.html
+#	dh_installexamples lc.* lconline/*.html
 #	dh_installmenu
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installinit
 #	dh_installcron
-	dh_installman linkchecker.1
+#	dh_installman linkchecker.1
 #	dh_installinfo
 #	dh_undocumented linkchecker.1
-	dh_installchangelogs 
-	dh_link
+	dh_installchangelogs
+#	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
@@ -81,8 +93,5 @@ binary-indep: build install
 	dh_md5sums
 	dh_builddeb
 
-# Build architecture-dependent files here.
-binary-arch: build install
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure