diff --git a/.drone.yml b/.drone.yml
index b3fa3ca..405efdb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -16,7 +16,7 @@ pipeline:
     pull: true
     commands:
       - apt update && apt install -y build-essential
-      - debuild -us -uc
+      - make package
       - ls -la
     when:
       event: tag
diff --git a/Makefile b/Makefile
index dba42bf..635e5b5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,16 @@
 PKGNAME := mdg-test
 UPSTREAM_VERSION := 3.9.2
 PKG_SUB_RELEASE := 1.0
-PKG_FULL_VERSION := $(UPSTREAM_VERSION)-$(PKG_SUB_RELEASE)
 
 SOURCE := https://www.python.org/ftp/python/$(UPSTREAM_VERSION)/python-$(UPSTREAM_VERSION)-amd64.exe
 CHECKSUM := efb20aa1b648a2baddd949c142d6eb06
 ## Download Link and Checksums can be found on https://www.python.org/downloads/windows/
 
+#Automatically set variables
+PKG_FULL_VERSION := $(UPSTREAM_VERSION)-$(PKG_SUB_RELEASE)
+DEB_CHANGELOG_VERSION := $(shell dpkg-parsechangelog -S Version | sed -rne 's|((-*[^-]+)+)(-[^-]+)|\1|p')
+DEB_ORIG_FILE := $(PKGNAME)_$(PKG_FULL_VERSION).orig.tar.gz
+
 default: download
 
 all: | clean install
@@ -38,5 +42,17 @@ setversion:
 	-e "s/^packageVersion: [0-9]\{1,3\}\.[0-9]\{1,3\}$$/packageVersion: $(PKG_SUB_RELEASE)/" \
 	-i control
 
-.PHONY: default all download install uninstall clean setversion
+check-before-package:
+	@if [ "$(DEB_CHANGELOG_VERSION)" != "$(PKG_FULL_VERSION)" ]; then \
+		echo "Mismatch between debian changelog file and Makefile version"; \
+		echo "Debian changelog version: $(DEB_CHANGELOG_VERSION)"; \
+		echo "Makefile version: $(PKG_FULL_VERSION)"; \
+		exit 1; \
+	fi
+
+package: check-before-package
+	tar cavzf ../mdg-test_3.9.2-1.0.orig.tar.gz --exclude="debian" --exclude="**/.*" .
+	debuild -us -uc
+
+.PHONY: default all download install uninstall clean setversion check-berfore-package package
 
diff --git a/debian/changelog b/debian/changelog
index 17ba125..3cbc304 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mdg-test (1.1.1-2.2-1) unstable; urgency=medium
+mdg-test (3.9.2-1.0-1) unstable; urgency=medium
 
   * Initial release. (Closes: #XXXXXX)