diff --git a/apache2.spec b/apache2.spec
index 7e130e0..da3093b 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -21,7 +21,8 @@
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
-%define apache_mmn	%(test -s %{SOURCE0} && { echo -n apache_mmn_; bzcat %{SOURCE0} | awk '/^#define MODULE_MAGIC_NUMBER_MAJOR/ {printf "%d", $3}'; })
+%define src_name        httpd-%{version}
+%define apache_mmn	%(test -s %{src_name}.tar.bz2 && { echo -n apache_mmn_; bzcat %{src_name}.tar.bz2 | awk '/^#define MODULE_MAGIC_NUMBER_MAJOR/ {printf "%d", $3}'; } || echo apache_mmn_notfound)
 %define suse_maintenance_mmn  0
 %define	default_mpm	prefork
 %define prefork 1
@@ -74,8 +75,8 @@ Summary:        The Apache Web Server Version 2.4
 License:        Apache-2.0
 Group:          Productivity/Networking/Web/Servers
 Url:            http://httpd.apache.org/
-Source0:        http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
-Source1:        http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc
+Source0:        http://www.apache.org/dist/httpd/%{src_name}.tar.bz2
+Source1:        http://www.apache.org/dist/httpd/%{src_name}.tar.bz2.asc
 Source2:        apache2.keyring
 # Add file to take mtime from it in prep section
 Source3:        apache2.changes
@@ -333,7 +334,7 @@ Utilities provided by the Apache 2 Web Server project which are useful
 to administrators of web servers in general.
 
 %prep
-%setup -q -n httpd-%{version} -a30
+%setup -q -n %{src_name} -a30
 %patch2 -p1
 %patch23
 %patch66 -p1