diff --git a/rpmlint.changes b/rpmlint.changes
index 9e82ed4..e9152c4 100644
--- a/rpmlint.changes
+++ b/rpmlint.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Dec 19 15:05:34 UTC 2010 - jw@novell.com
+
+- Fix message for no-changelogname-tag: 
+  This is also caused by missing changes file.
+  Original message posed a contradiction, in case the 
+  %changelog section header was there.
+
 -------------------------------------------------------------------
 Wed Nov 24 11:43:53 CET 2010 - dmueller@suse.de
 
diff --git a/rpmlint.spec b/rpmlint.spec
index 0acb985..1e6d119 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -123,6 +123,7 @@ Patch81:        suse-whitelist-opensuse.diff
 Patch82:        rpmlint-badness-info.diff
 Patch83:        incoherent-warning-fix.diff
 Patch84:        extend-suse-conffiles-check.diff
+Patch85:	suse-changelog.patch
 %py_requires
 
 %description
@@ -202,6 +203,8 @@ Authors:
 %patch82 -p1
 %patch83
 %patch84
+# suse-changelog.patch
+%patch85 -p1
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
diff --git a/suse-changelog.patch b/suse-changelog.patch
new file mode 100644
index 0000000..3bc761f
--- /dev/null
+++ b/suse-changelog.patch
@@ -0,0 +1,13 @@
+--- rpmlint-1.0/TagsCheck.py.orig	2010-12-19 15:51:54.000000000 +0100
++++ rpmlint-1.0/TagsCheck.py	2010-12-19 15:56:43.000000000 +0100
+@@ -1008,8 +1008,8 @@ Development/''',
+ "%s".''' % '", "'.join(VALID_GROUPS),
+ 
+ 'no-changelogname-tag',
+-'''There is no %changelog tag in your spec file. To insert it, just insert a
+-'%changelog' in your spec file and rebuild it.''',
++'''There is no changelog. Please insert a '%changelog' section heading in your
++spec file and prepare your changes file using e.g. the 'osc vc' command.''',
+ 
+ 'no-version-in-last-changelog',
+ '''The last changelog entry doesn't contain a version. Please insert the