diff --git a/.gitattributes b/.gitattributes
index 1c5d4e4940..8b97eebe36 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1161,6 +1161,9 @@ debian/links svneol=native#text/plain
 debian/menu svneol=native#text/plain
 debian/move-usr-lib.sh svneol=native#text/plain
 debian/orig-tar.sh svneol=native#text/plain
+debian/patches/00list svneol=native#text/plain
+debian/patches/01_topmakefile.dpatch svneol=native#text/plain
+debian/patches/02_components.dpatch svneol=native#text/plain
 debian/rules svneol=native#text/plain
 debian/watch svneol=native#text/plain
 debugger/breakpointsdlg.lfm svneol=native#text/plain
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000000..df68d067fa
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1,2 @@
+01_topmakefile
+02_components
diff --git a/debian/patches/01_topmakefile.dpatch b/debian/patches/01_topmakefile.dpatch
new file mode 100755
index 0000000000..27bd02be33
--- /dev/null
+++ b/debian/patches/01_topmakefile.dpatch
@@ -0,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_unit_dbase.dpatch by  <Mazen Neifer <mazen.neifer@supaero.org>>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch fixes dist_clean target used to remove generated
+## DP: files before packaging sources.
+
+@DPATCH@
+Index: Makefile.fpc
+===================================================================
+--- lazarus/Makefile.fpc	(révision 15506)
++++ lazarus/Makefile.fpc	(copie de travail)
+@@ -11,7 +11,7 @@
+ 
+ [target]
+ programs=lazarus startlazarus
+-dirs=lcl components packager/registration ideintf designer packager
++dirs=lcl components packager/registration ideintf designer packager ide tools
+ exampledirs=examples
+ 
+ [compiler]
+@@ -40,13 +40,9 @@
+ 
+ #-----------------------------------------------------------------------------
+ [rules]
+-.PHONY: lcl components packager/registration ideintf packager bigidecomponents ide idepkg idebig bigide starter lazbuilder tools all clean cleanide purge examples install
++.PHONY: lcl components packager/registration ideintf packager bigidecomponents idepkg idebig bigide starter lazbuilder all clean cleanide purge examples install
+ 
+ #-----------------------------------------------------------------------------
+-ide: 
+-	$(MAKE) -C ide ide
+-
+-#-----------------------------------------------------------------------------
+ idepkg:
+ 	$(MAKE) -C ide idepkg
+ 
+@@ -75,7 +71,6 @@
+ 
+ #-----------------------------------------------------------------------------
+ tools: lcl components
+-	$(MAKE) -C tools
+ 	
+ #-----------------------------------------------------------------------------
+ examples: lcl components
+@@ -127,7 +122,7 @@
+ 	ln -sf $(LAZARUS_INSTALL_DIR)/lazarus $(INSTALL_PREFIX)/bin/lazarus-ide
+ 	ln -sf $(LAZARUS_INSTALL_DIR)/startlazarus $(INSTALL_PREFIX)/bin/startlazarus
+ 	ln -sf $(LAZARUS_INSTALL_DIR)/lazbuild $(INSTALL_PREFIX)/bin/lazbuild
+-	cat $(LAZARUS_INSTALL_DIR)/docs/lazbuild.1 | gzip > $(INSTALL_MAN_DIR)/man1/lazbuild.1.gz
++	cat $(LAZARUS_INSTALL_DIR)/install/man/man1/lazbuild.1 | gzip > $(INSTALL_MAN_DIR)/man1/lazbuild.1.gz
+ endif
+ 
diff --git a/debian/patches/02_components.dpatch b/debian/patches/02_components.dpatch
new file mode 100755
index 0000000000..cdaf829384
--- /dev/null
+++ b/debian/patches/02_components.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_unit_dbase.dpatch by  <Mazen Neifer <mazen.neifer@supaero.org>>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch fixes compilation of printer support units on architectures
+## DP: which do not have libc unit (ie all except i386).
+
+@DPATCH@
+Index: components/Makefile.fpc
+===================================================================
+--- lazarus/components/Makefile.fpc	(révision 15506)
++++ lazarus/components/Makefile.fpc	(copie de travail)
+@@ -4,7 +4,7 @@
+ #
+ 
+ [target]
+-dirs=synedit codetools
++dirs=synedit codetools cgi cgi/ide printers printers/design fpcunit fpcunit/ide memds projecttemplates rtticontrols sdf sqldb tachart tdbf turbopower_ipro
+ 
+ [clean]
+ files=$(wildcard ./units/*$(OEXT)) \
diff --git a/debian/rules b/debian/rules
index a66e18292c..a9c25543d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
 # Clean
 #
 
-clean: configure clean-patched unpatch
+clean: patch configure clean-patched unpatch
 clean-patched:
 	@echo "--- Cleaning"
 	dh_testdir
@@ -51,11 +51,11 @@ clean-patched:
 patch: patch-stamp
 
 patch-stamp:
-	dpatch apply-all
+	dpatch apply-all -v
 	touch patch-stamp
 
 unpatch:
-	dpatch deapply-all
+	dpatch deapply-all -v
 	rm -rf patch-stamp debian/patched
 
 ###################