diff --git a/dist/Makefile b/dist/Makefile
index 685815c5..88d9c3df 100644
--- a/dist/Makefile
+++ b/dist/Makefile
@@ -1,8 +1,11 @@
 VERSION=1.2.0
 
+check:
+	rpmlint -i dist/paho-c.spec
+
 rpm-prep:
 	mkdir -p ${HOME}/rpmbuild/SOURCES/
-	tar --transform="s/\./paho-c-${VERSION}/" -cf ${HOME}/rpmbuild/SOURCES/paho-c-${VERSION}.tar.gz --exclude=./build.paho --exclude=.git --exclude=*.bz ./ --gzip
+	tar --transform="s/\./paho-c-${VERSION}/" -cf ${HOME}/rpmbuild/SOURCES/v${VERSION}.tar.gz --exclude=./build.paho --exclude=.git --exclude=*.bz ./ --gzip
 
 rpm: rpm-prep
 	rpmbuild -ba dist/paho-c.spec
diff --git a/dist/paho-c.spec b/dist/paho-c.spec
index 143ac28a..93143496 100644
--- a/dist/paho-c.spec
+++ b/dist/paho-c.spec
@@ -1,13 +1,10 @@
-%global _enable_debug_package 0
-%global debug_package %{nil}
-
 Summary:            MQTT C Client
 Name:               paho-c
 Version:            1.2.0
-Release:            0%{?dist}
+Release:            3%{?dist}
 License:            Eclipse Distribution License 1.0 and Eclipse Public License 1.0
 Group:              Development/Tools
-Source:             paho-c-%{version}.tar.gz
+Source:             https://github.com/eclipse/paho.mqtt.c/archive/v%{version}.tar.gz
 URL:                https://eclipse.org/paho/clients/c/
 BuildRequires:      cmake
 BuildRequires:      gcc
@@ -42,12 +39,12 @@ Development documentation files for the the Paho MQTT C Client.
 
 %build
 mkdir build.paho && cd build.paho
-cmake -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_DOCUMENTATION=TRUE -DPAHO_BUILD_SAMPLES=TRUE -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr ..
-make
+%cmake -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_DOCUMENTATION=TRUE -DPAHO_BUILD_SAMPLES=TRUE ..
+make %{?_smp_mflags}
 
 %install
 cd build.paho
-make install
+make install DESTDIR=%{buildroot}
 
 %files
 %doc edl-v10 epl-v10
@@ -61,5 +58,21 @@ make install
 %{_datadir}/*
 
 %changelog
-* Sat Dec 31 2016 Otavio R. Piske <opiske@redhat.com> - 20161231
+* Thu Jul 27 2017 Otavio R. Piske <opiske@redhat.com> - 1.2.0-4
+- Enabled generation of debuginfo package
+
+* Thu Jul 27 2017 Otavio R. Piske <opiske@redhat.com> - 1.2.0-3
+- Fixed changelog issues pointed by rpmlint
+
+* Thu Jul 27 2017 Otavio R. Piske <opiske@redhat.com> - 1.2.0-2
+- Updated changelog to comply with Fedora packaging guidelines
+
+* Wed Jul 26 2017 Otavio R. Piske <opiske@redhat.com> - 1.2.0-1
+- Fixed rpmlint warnings: replaced cmake call with builtin macro
+- Fixed rpmlint warnings: removed buildroot reference from build section
+
+* Fri Jun 30 2017 Otavio R. Piske <opiske@redhat.com> - 1.2.0
+- Updated package to version 1.2.0
+
+* Sat Dec 31 2016 Otavio R. Piske <opiske@redhat.com> - 1.1.0
 - Initial packaging