diff -Nru conserver-8.1.18/autologin/Makefile conserver-8.1.18/autologin/Makefile
--- conserver-8.1.18/autologin/Makefile	2014-01-21 16:13:00.000000000 -0500
+++ conserver-8.1.18/autologin/Makefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,52 +0,0 @@
-### Path settings
-srcdir = .
-top_srcdir = ..
-prefix = /usr
-exec_prefix = ${prefix}
-bindir = ${exec_prefix}/bin
-sysconfdir = /etc/conserver
-
-### Installation programs and flags
-INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL} -s
-LN_S = ln -s
-MKDIR = mkdir -p -m 755
-
-### Compiler and link options
-CC	= gcc
-CFLAGS	= -O # -DPUCC -DSUN5
-DEFS	= -DHAVE_CONFIG_H -DSYSCONFDIR=\"$(sysconfdir)\"
-CPPFLAGS = -I.. -I$(top_srcdir) -I$(srcdir) $(DEFS)  
-LDFLAGS	=  
-LIBS	= -lutil -lcrypt  -lssl -lcrypto
-
-
-
-### Makefile rules - no user-servicable parts below
-
-AUTOLOGIN_OBJS = main.o autologin.o
-AUTOLOGIN_HDRS = ../config.h $(top_srcdir)/compat.h $(srcdir)/main.h
-ALL = autologin
-
-
-all: $(ALL)
-
-$(AUTOLOGIN_OBJS): $(AUTOLOGIN_HDRS)
-
-autologin: $(AUTOLOGIN_OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o autologin $(AUTOLOGIN_OBJS) $(LIBS)
-
-.c.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
-
-clean:
-	rm -f *~ *.o $(ALL) core
-
-distclean: clean
-	rm -f Makefile
-
-install: autologin
-	$(MKDIR) $(DESTDIR)$(bindir)
-	$(INSTALL_PROGRAM) autologin $(DESTDIR)$(bindir)
-
-.PHONY: clean distclean install
diff -Nru conserver-8.1.18/conserver/test.cf conserver-8.1.18/conserver/test.cf
--- conserver-8.1.18/conserver/test.cf	2014-01-21 16:13:00.000000000 -0500
+++ conserver-8.1.18/conserver/test.cf	1969-12-31 19:00:00.000000000 -0500
@@ -1,30 +0,0 @@
-# dummy conserver config file
-#
-# $Id: dummy.cf,v 4.3 92/07/27 12:23:59 ksb Exp $
-#
-# 1. change the `/dev/ttya' to any tty device you can put a serial device on
-#    that you could talk to with kermit/cu.  Put in the baud rate and parity.
-#
-# 2. change the `cc.purdue.edu' to your local domain.
-#
-# 3. !! do not leave this up, as it can give local users a root shell (login)
-#    !! for extended testing change the `|' to `|su - tst' where tst is a
-#    !! vanilla test acount, or comment out the `login' console.
-#
-# list of consoles we serve
-# name : tty[@host] : baud[parity] : device : group
-DOMAINHACK=
-LOGDIR=/tmp
-BREAK5=\rtest\r
-# shell:|:9600p:&:5
-# bash:|/usr/local/bin/bash::&:2
-web:!localhost:80:&:
-# b:/dev/ttyb:9600p:&:
-#ts6-10:!ts6:10010:&:
-#ts6-11:!ts6:10011:&:
-#ts6-12:!ts6:10012:&:
-#ts6-13:!ts6:10013:&:
-%%
-# list of clients we allow
-# type machines
-trusted: 127.0.0.1
diff -Nru conserver-8.1.18/contrib/chat/Makefile conserver-8.1.18/contrib/chat/Makefile
--- conserver-8.1.18/contrib/chat/Makefile	2014-01-21 16:13:00.000000000 -0500
+++ conserver-8.1.18/contrib/chat/Makefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,52 +0,0 @@
-### Path settings
-srcdir = .
-top_srcdir = ../..
-prefix = /usr
-exec_prefix = ${prefix}
-bindir = ${exec_prefix}/bin
-sysconfdir = /etc/conserver
-mandir = ${prefix}/share/man
-
-### Installation programs and flags
-INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL} -s
-LN_S = ln -s
-MKDIR = mkdir -p -m 755
-
-### Compiler and link options
-CC	= gcc
-CFLAGS	= -O
-DEFS	= -DHAVE_CONFIG_H
-CPPFLAGS = -I$(top_srcdir) -I$(srcdir) $(DEFS)  
-LDFLAGS	=  
-LIBS	= -lutil -lcrypt  -lssl -lcrypto
-
-
-
-### Makefile rules - no user-servicable parts below
-
-CHAT_OBJS = chat.o
-CHAT_HDRS = ../../config.h
-ALL = chat
-
-all: $(ALL)
-
-chat: $(CHAT_OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o chat $(CHAT_OBJS) $(LIBS)
-
-.c.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
-
-clean:
-	rm -f *~ *.o $(ALL) core
-
-distclean: clean
-	rm -f Makefile
-
-install: chat
-	$(MKDIR) $(DESTDIR)$(bindir)
-	$(INSTALL_PROGRAM) chat $(DESTDIR)$(bindir)
-	$(MKDIR) $(DESTDIR)$(mandir)/man1
-	$(INSTALL) chat.man $(DESTDIR)$(mandir)/man1/chat.1
-
-.PHONY: clean distclean install
diff -Nru conserver-8.1.18/debian/control conserver-8.1.18/debian/control
--- conserver-8.1.18/debian/control	2014-01-21 16:13:00.000000000 -0500
+++ conserver-8.1.18/debian/control	2014-01-21 16:01:13.000000000 -0500
@@ -1,8 +1,9 @@
 Source: conserver
 Section: non-free/comm
 Priority: optional
-Maintainer: Jörgen Hägg <jh@debian.org>
-Build-Depends: debhelper (>= 7.0.50), po-debconf, libpam0g-dev, libwrap0-dev, libssl-dev
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jörgen Hägg <jh@debian.org>
+Build-Depends: debhelper (>= 7.0.50), po-debconf, libpam0g-dev, libwrap0-dev, libssl-dev, autotools-dev
 Standards-Version: 3.9.3
 XS-Autobuild: yes
 Homepage: http://www.conserver.com/
diff -Nru conserver-8.1.18/debian/rules conserver-8.1.18/debian/rules
--- conserver-8.1.18/debian/rules	2014-01-21 16:13:00.000000000 -0500
+++ conserver-8.1.18/debian/rules	2014-01-21 16:00:57.000000000 -0500
@@ -6,7 +6,7 @@
 serverd = debian/$(server)
 
 %:
-	dh $@
+	dh $@ --with autotools-dev
 
 override_dh_auto_configure:
 	./configure \
diff -Nru conserver-8.1.18/debian/source/format conserver-8.1.18/debian/source/format
--- conserver-8.1.18/debian/source/format	1969-12-31 19:00:00.000000000 -0500
+++ conserver-8.1.18/debian/source/format	2014-01-21 15:40:50.000000000 -0500
@@ -0,0 +1 @@
+3.0 (quilt)