diff --git a/packages/Makefile b/packages/Makefile
new file mode 100644
index 000000000..322dfeef7
--- /dev/null
+++ b/packages/Makefile
@@ -0,0 +1,4 @@
+make deb:
+	cd ..;\
+	ln -sf packages/debian . ;\
+	dpkg-buildpackage -us -uc
diff --git a/data/scripts/pkg/debian/cgrates.default b/packages/debian/cgrates.default
similarity index 100%
rename from data/scripts/pkg/debian/cgrates.default
rename to packages/debian/cgrates.default
diff --git a/data/scripts/pkg/debian/cgrates.init b/packages/debian/cgrates.init
similarity index 100%
rename from data/scripts/pkg/debian/cgrates.init
rename to packages/debian/cgrates.init
diff --git a/data/scripts/pkg/debian/changelog b/packages/debian/changelog
similarity index 100%
rename from data/scripts/pkg/debian/changelog
rename to packages/debian/changelog
diff --git a/data/scripts/pkg/debian/compat b/packages/debian/compat
similarity index 100%
rename from data/scripts/pkg/debian/compat
rename to packages/debian/compat
diff --git a/data/scripts/pkg/debian/control b/packages/debian/control
similarity index 100%
rename from data/scripts/pkg/debian/control
rename to packages/debian/control
diff --git a/data/scripts/pkg/debian/copyright b/packages/debian/copyright
similarity index 100%
rename from data/scripts/pkg/debian/copyright
rename to packages/debian/copyright
diff --git a/data/scripts/pkg/debian/docs b/packages/debian/docs
similarity index 100%
rename from data/scripts/pkg/debian/docs
rename to packages/debian/docs
diff --git a/data/scripts/pkg/debian/postinst b/packages/debian/postinst
similarity index 100%
rename from data/scripts/pkg/debian/postinst
rename to packages/debian/postinst
diff --git a/data/scripts/pkg/debian/rules b/packages/debian/rules
similarity index 71%
rename from data/scripts/pkg/debian/rules
rename to packages/debian/rules
index fff3e4108..98db87e19 100755
--- a/data/scripts/pkg/debian/rules
+++ b/packages/debian/rules
@@ -10,25 +10,26 @@ PKGDIR=debian/cgrates
 SRCDIR=src/github.com/cgrates/cgrates
 
 %:
-	dh $@ 
+	dh $@
 
 clean:
 	dh_clean
 	rm -rf $(GOPATH)/bin/* $(GOPATH)/pkg/*
-	#cd $(GOPATH)/src && find * -name '*.go' -exec dirname {} \; | xargs -n1 go clean
+	# #cd $(GOPATH)/src && find * -name '*.go' -exec dirname {} \; | xargs -n1 go clean
 	rm -f $(GOPATH)/goinstall.log
 
 binary-arch: clean
 	dh_prep
 	dh_installdirs
-	exec $(SRCDIR)/update_external_libs.sh
-	cd $(SRCDIR) && go install
+	exec $(CURDIR)/update_external_libs.sh
+	ln -sf $(CURDIR) src/github.com/cgrates/cgrates
+	cd $(CURDIR)/src/github.com/cgrates/cgrates/ && go install
 	mkdir -p $(PKGDIR)/usr/bin
 	cp $(GOPATH)/bin/cgr-* $(PKGDIR)/usr/bin/
 	mkdir -p $(PKGDIR)/etc/
-	cp -r $(SRCDIR)/data/conf/cgrates $(PKGDIR)/etc/
+	cp -r $(CURDIR)/data/conf/cgrates $(PKGDIR)/etc/
 	mkdir -p $(PKGDIR)/usr/share/cgrates
-	cp -r $(SRCDIR)/data/* $(PKGDIR)/usr/share/cgrates/
+	cp -r $(CURDIR)/data/* $(PKGDIR)/usr/share/cgrates/
 	mkdir -p $(PKGDIR)/var/log/cgrates/cdrc/in
 	mkdir -p $(PKGDIR)/var/log/cgrates/cdrc/out
 	mkdir -p $(PKGDIR)/var/log/cgrates/cdre/csv
diff --git a/data/scripts/pkg/debian/source/format b/packages/debian/source/format
similarity index 100%
rename from data/scripts/pkg/debian/source/format
rename to packages/debian/source/format
diff --git a/data/scripts/pkg/debian/source/options b/packages/debian/source/options
similarity index 100%
rename from data/scripts/pkg/debian/source/options
rename to packages/debian/source/options