diff --git a/Makefile.in b/Makefile.in
index 055ab4e..f70a6ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -70,24 +70,39 @@ ifneq ($(CONVERT),no)
 	@$(CONVERT) $< --format=png > $@
 endif
 
+debian/%.install: src/%/Makefile
+	@$(MAKE) DEBDIR=../../debian -C $(dir $^) ../../$@
+
 #---[ Release targets ]--------------------------------------------------------
 
-all: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
+all: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) filelist
 
-Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
+Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) 
 
-$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/gtk/* $(BINDIR)/Release/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS)
-	@$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
+$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS)
+	@$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
 
 $(BINDIR)/Release/lib/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile
 	@$(MAKE) BINRLS=../../.bin/Release/lib -C src/lib3270 ../../.bin/Release/lib/@DLLPREFIX@3270@DLLEXT@
 
+#---[ File lists ]-------------------------------------------------------------
+
+filelist: debian/lib3270.install debian/lib3270-dev.install debian/pw3270.install
+
+debian/lib3270-dev.install: Makefile
+	@echo "  GEN  `basename $@`"
+	@$(MKDIR) `dirname $@`
+	@echo "$(includedir)/lib3270.h" > $@
+	@echo "$(includedir)/lib3270" >> $@
+	@echo "$(datarootdir)/@PACKAGE_NAME@/ui/99debug.xml" >> $@
+	@echo "$(libdir)/pkgconfig/*.pc" >: $@
+
 #---[ Debug targets ]----------------------------------------------------------
 
 Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
 
-$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/gtk/* $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS)
-	@$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(DBGLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk ../../$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
+$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS)
+	@$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(DBGLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
 
 $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile
 	@$(MAKE) BINDBG=../../.bin/Debug/lib -C src/lib3270 ../../.bin/Debug/lib/@DLLPREFIX@3270@DLLEXT@
@@ -99,7 +114,7 @@ memchk: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
 ifeq ($(VALGRIND),no)
 	@PATH="$(BINDIR)/Debug/lib:$(PATH)" "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)"
 else
-	@PATH="$(BINDIR)/Debug/lib:$(PATH)" G_DEBUG=gc-friendly G_SLICE=always-malloc \$(VALGRIND) --leak-check=full --suppressions=src/gtk/valgrind.suppression --gen-suppressions=all $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
+	@PATH="$(BINDIR)/Debug/lib:$(PATH)" G_DEBUG=gc-friendly G_SLICE=always-malloc \$(VALGRIND) --leak-check=full --suppressions=src/pw3270/valgrind.suppression --gen-suppressions=all $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
 endif
 
 #---[ Targets ]----------------------------------------------------------------
@@ -140,7 +155,7 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean $(PACKAGE_NAME).png $(PACKAG
 	@echo $@
 
 install: install-sdk install-lib $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png
-	@make BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk install
+	@make BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install
 
 	@$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
 	@$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
@@ -163,17 +178,18 @@ clean:
 	@rm -fr .obj
 	@rm -fr .bin
 	@rm -fr .tmp
+	@rm -f debian/*.install
 	@make -C src/lib3270 clean
-	@make -C src/gtk clean
+	@make -C src/pw3270 clean
 	@rm -f *.log
 
 distclean: clean
-	@rm -f src/gtk/Makefile
+	@rm -f src/pw3270/Makefile
 	@rm -f config.status
 	@rm -f src/lib3270/mkversion.sh
 	@rm -f src/lib3270/Makefile
 	@rm -f src/include/lib3270/config.h
-	@rm -f src/gtk/uiparser/Makefile
+	@rm -f src/pw3270/uiparser/Makefile
 	@rm -fr autom4te.cache
 	@rm -f *.pc
 
diff --git a/configure.ac b/configure.ac
index f7ebdc5..4f5da1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -269,9 +269,9 @@ AC_CONFIG_FILES([
 	src/include/rules.mak
 	src/lib3270/Makefile
 	src/lib3270/mkversion.sh
-	src/gtk/Makefile
-	src/gtk/uiparser/Makefile
-	src/gtk/common/common.h
+	src/pw3270/Makefile
+	src/pw3270/uiparser/Makefile
+	src/pw3270/common/common.h
 
 ])
 
diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in
index be8ca4f..482ab8e 100644
--- a/src/lib3270/Makefile.in
+++ b/src/lib3270/Makefile.in
@@ -123,6 +123,10 @@ $(BINDBG)/testprogram$(EXEEXT): $(OBJDBG)/testprogram.o $(foreach SRC, $(basenam
 	@$(MKDIR) `dirname $@`
 	$(LD) -o $@ $^ $(LIBS)
 
+$(DEBDIR)/lib3270.install: Makefile
+	@echo "  GEN  `basename $@`"
+	@$(MKDIR) `dirname $@`
+	@echo "$(libdir)/lib3270.so" > $@
 
 run: $(BINDBG)/testprogram$(EXEEXT)
 	$(BINDBG)/testprogram$(EXEEXT)
diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in
index 0e6354a..d9582cc 100644
--- a/src/pw3270/Makefile.in
+++ b/src/pw3270/Makefile.in
@@ -35,6 +35,7 @@ exec_prefix=@exec_prefix@
 bindir=@bindir@
 datarootdir=@datarootdir@
 localedir=@localedir@
+DEBDIR ?= debian
 
 EXEEXT=@EXEEXT@
 STRIP=@STRIP@
@@ -101,6 +102,14 @@ endif
 
 #---[ Misc targets ]-----------------------------------------------------------
 
+$(DEBDIR)/pw3270.install: Makefile
+	@echo "  GEN  `basename $@`"
+	@$(MKDIR) `dirname $@`
+	@echo "$(bindir)/@PACKAGE_NAME@" >> $@
+	@echo "$(datarootdir)/@PACKAGE_NAME@/ui/00default.xml" >> $@
+	@echo "$(datarootdir)/@PACKAGE_NAME@/@PACKAGE_NAME@.png" >> $@
+	@echo "$(datarootdir)/@PACKAGE_NAME@/@PACKAGE_NAME@-logo.png" >> $@
+
 v3270/marshal.h: v3270/genmarshal
 	@$(MKDIR) `dirname $@`
 	@glib-genmarshal --prefix=$(PACKAGE_NAME) --header v3270/genmarshal > $@
--
libgit2 0.21.2