diff --git a/dnsmasq-2.40.tar.bz2 b/dnsmasq-2.40.tar.bz2
new file mode 100644
index 0000000..ca24e4f
--- /dev/null
+++ b/dnsmasq-2.40.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:20522fe06f073db650d898ca018d256f59a1827f5f8218776ca058bc1442582f
+size 247998
diff --git a/dnsmasq-2.40.tar.gz b/dnsmasq-2.40.tar.gz
deleted file mode 100644
index 6276910..0000000
--- a/dnsmasq-2.40.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:16517856930074fa4bba739f40ca1dd4a11b80a0623a12f2ae7be701083564e0
-size 307051
diff --git a/dnsmasq.changes b/dnsmasq.changes
index d812605..5df5b67 100644
--- a/dnsmasq.changes
+++ b/dnsmasq.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan  4 06:32:08 CET 2008 - crrodriguez@suse.de
+
+- bzip tarball
+- use find_lang macro. 
+
 -------------------------------------------------------------------
 Thu Dec  6 17:21:05 CET 2007 - ug@suse.de
 
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 07a34cc..c5d88aa 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dnsmasq (Version 2.40)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -13,14 +13,14 @@
 Name:           dnsmasq
 Summary:        Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
 Version:        2.40
-Release:        1
+Release:        5
 License:        GPL v2 or later
 Group:          Productivity/Networking/DNS/Servers
 Provides:       dns_daemon
 PreReq:         %fillup_prereq %insserv_prereq /bin/mkdir
 AutoReqProv:    on
 Url:            http://www.thekelleys.org.uk/dnsmasq/
-Source:         %{name}-%{version}.tar.gz
+Source:         %{name}-%{version}.tar.bz2
 Source1:        vendor-files.tar.bz2
 Patch1:         group_and_isc.diff 	
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -48,7 +48,8 @@ Authors:
 
 %build
 mv po/no.po po/nb.po
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" make
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" 
+%{__make} %{?jobs:-j%jobs}
 
 %post
 %{fillup_and_insserv dnsmasq}
@@ -61,10 +62,9 @@ CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" make
 %{insserv_cleanup}
 
 %clean
-[ -d %{buildroot} -a "%{buildroot}" != "" ] && rm -rf  %{buildroot}
+rm -rf  %{buildroot}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr
 install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d
 install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d
@@ -75,23 +75,26 @@ install -m 644 dnsmasq.conf.example $RPM_BUILD_ROOT/%{_sysconfdir}/dnsmasq.conf
 install -m 644 dnsmasq.reg  $RPM_BUILD_ROOT/%{_sysconfdir}/slp.reg.d/
 install -m 644 SuSEFirewall.dnsmasq-dns ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
 install -m 644 SuSEFirewall.dnsmasq-dhcp ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
+%find_lang %{name}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc CHANGELOG COPYING FAQ doc.html setup.html dnsmasq.conf.example contrib
 %config(noreplace) /%{_sysconfdir}/dnsmasq.conf
-/%{_sysconfdir}/init.d/dnsmasq
-/usr/sbin/rcdnsmasq
-/usr/sbin/dnsmasq
-/usr/share/locale/*/LC_MESSAGES/*
-/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
-/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
-/%{_sysconfdir}/slp.reg.d/
+%{_sysconfdir}/init.d/dnsmasq
+%{_sbindir}/rcdnsmasq
+%{_sbindir}/dnsmasq
+%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
+%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
+%{_sysconfdir}/slp.reg.d/
 %attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg
-%doc %{_mandir}/man8/dnsmasq.8.gz
-%doc %{_mandir}/es/man8/dnsmasq.8.gz
+%{_mandir}/man8/dnsmasq.8.gz
+%{_mandir}/es/man8/dnsmasq.8.gz
 
 %changelog
+* Fri Jan 04 2008 - crrodriguez@suse.de
+- bzip tarball
+- use find_lang macro.
 * Thu Dec 06 2007 - ug@suse.de
 - version 2.40
 - Fix handling of fully-qualified names in --dhcp-host