diff --git a/rpm/_service b/rpm/_service
index 770ae16..f004a4a 100644
--- a/rpm/_service
+++ b/rpm/_service
@@ -5,15 +5,44 @@
         <param name="changesgenerate">enable</param>
       	<param name="changesauthor">perry.werneck@gmail.com</param>
 		<param name="versionformat">@PARENT_TAG@</param>
-		<param name="url">https://github.com/PerryWerneck/lib3270-hllapi-bindings.git</param>
+		<param name="url">https://github.com/PerryWerneck/libhllapi.git</param>
 		<param name="scm">git</param>
 	</service>
 
 	<!-- https://github.com/openSUSE/obs-service-extract_file -->
-	<!-- service name="extract_file">
+	<service name="extract_file">
 		<param name="archive">*.tar</param>
-		<param name="files">*/rpm/*.spec</param>
-	</service -->
+		<param name="files">*/rpm/libhllapi.spec</param>
+	</service>
+
+	<service name="extract_file">
+		<param name="archive">*.tar</param>
+		<param name="files">*/debian/changelog</param>
+		<param name="outfilename">debian.changelog</param>
+	</service>
+  
+	<service name="extract_file">
+		<param name="archive">*.tar</param>
+		<param name="files">*/debian/*.dsc</param>
+	</service>
+
+	<service name="extract_file">
+		<param name="archive">*.tar</param>
+		<param name="files">*/debian/control</param>
+		<param name="outfilename">debian.control</param>
+	</service>
+
+	<service name="extract_file">
+		<param name="archive">*.tar</param>
+		<param name="files">*/debian/rules</param>
+		<param name="outfilename">debian.rules</param>
+	</service>
+
+  	<service name="extract_file">
+		<param name="archive">*.tar</param>
+		<param name="files">*/debian/compat</param>
+		<param name="outfilename">debian.compat</param>
+	</service>
 
 	<service name="recompress">
 		<param name="file">*.tar</param>
diff --git a/rpm/libhllapi.spec b/rpm/libhllapi.spec
index 9508647..50d9753 100644
--- a/rpm/libhllapi.spec
+++ b/rpm/libhllapi.spec
@@ -18,35 +18,35 @@
 
 #---[ Package header ]------------------------------------------------------------------------------------------------
 
-Summary:	HLLAPI client library for lib3270/pw3270
-Name:		libhllapi
-Version:	5.2
-Release:	0
-License:	LGPL-3.0
-Source:		lib3270-hllapi-bindings-%{version}.tar.xz
+Summary:		HLLAPI client library for lib3270/pw3270
+Name:			libhllapi
+Version:		5.2
+Release:		0
+License:		LGPL-3.0
+Source:			%{name}-%{version}.tar.xz
 
-Url:		https://github.com/PerryWerneck/lib3270-hllapi-bindings.git
+Url:			https://github.com/PerryWerneck/libhllapi.git
 
 Group:			Development/Libraries/C and C++
 
-BuildRequires:  autoconf >= 2.61
-BuildRequires:  automake
-BuildRequires:  binutils
-BuildRequires:  coreutils
-BuildRequires:  gcc-c++
-BuildRequires:  gettext-devel
-BuildRequires:  m4
+BuildRequires:	autoconf >= 2.61
+BuildRequires:	automake
+BuildRequires:	binutils
+BuildRequires:	coreutils
+BuildRequires:	gcc-c++
+BuildRequires:	gettext-devel
+BuildRequires:	m4
 BuildRequires:  pkgconfig(ipc3270)
 
 %if 0%{?fedora} ||  0%{?suse_version} > 1200
 
 BuildRequires:	gcc-c++
-BuildRequires:  pkgconfig(ipc3270)
+BuildRequires:	pkgconfig(ipc3270)
 
 %else
 
-BuildRequires:  gcc-c++ >= 4.8
-BuildRequires:  libipc3270-devel
+BuildRequires:	gcc-c++ >= 4.8
+BuildRequires:	libipc3270-devel
 
 %endif
 
@@ -86,7 +86,7 @@ Development files for lib3270/pw3270 HLLAPI client library.
 #---[ Build & Install ]-----------------------------------------------------------------------------------------------
 
 %prep
-%setup -n lib3270-hllapi-bindings-%{version}
+%setup
 
 NOCONFIGURE=1 \
 	./autogen.sh
--
libgit2 0.21.2