diff --git a/rpmlint-0.95-srcfilename.patch b/rpmlint-0.95-srcfilename.patch
new file mode 100644
index 0000000..71057ad
--- /dev/null
+++ b/rpmlint-0.95-srcfilename.patch
@@ -0,0 +1,19 @@
+Index: TagsCheck.py
+===================================================================
+--- TagsCheck.py	(revision 1737)
++++ TagsCheck.py	(revision 1738)
+@@ -803,8 +803,12 @@
+                     j += 1
+                 i += 1
+ 
+-        expected = pkg.header.sprintf(
+-            rpm.expandMacro("%{_build_name_fmt}")).split("/")[-1]
++        expfmt = rpm.expandMacro("%{_build_name_fmt}")
++        if pkg.isSource():
++            # _build_name_fmt often (always?) ends up not outputting src/nosrc
++            # as arch for source packages, do it ourselves
++            expfmt = re.sub(r'(?i)%\{?ARCH\b\}?', pkg.arch, expfmt)
++        expected = pkg.header.sprintf(expfmt).split("/")[-1]
+         basename = os.path.basename(pkg.filename)
+         if basename != expected:
+             printWarning(pkg, 'non-coherent-filename', basename, expected)
diff --git a/rpmlint.spec b/rpmlint.spec
index c923dd4..5e385b6 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.95
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -10,6 +10,8 @@ Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}.config
 Source2:        %{name}-CHANGES.package.old
 Source3:        %{name}-etc.config
+# http://rpmlint.zarb.org/cgi-bin/trac.cgi/changeset/1738/trunk/TagsCheck.py
+Patch0:         %{name}-0.95-srcfilename.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -39,6 +41,7 @@ and source packages as well as spec files can be checked.
 
 %prep
 %setup -q
+%patch0
 sed -i -e /MenuCheck/d Config.py
 cp -p config config.example
 install -pm 644 %{SOURCE2} CHANGES.package.old
@@ -78,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Mar  6 2010 Ville Skyttä <ville.skytta@iki.fi> - 0.95-2
+- Patch to fix non-coherent-filename regression for source packages.
+
 * Wed Mar  3 2010 Ville Skyttä <ville.skytta@iki.fi> - 0.95-1
 - Update to 0.95; fixes #564585, #567285, #568498, and #570086.