diff --git a/rpmlint.changes b/rpmlint.changes
index af64fbd..0141634 100644
--- a/rpmlint.changes
+++ b/rpmlint.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 29 14:29:57 UTC 2010 - lnussel@suse.de
+
+- don't print unstripped binary warning when used with build script
+  (bnc#618004)
+
 -------------------------------------------------------------------
 Mon Jun  7 08:33:32 UTC 2010 - andrea@opensuse.org
 
diff --git a/rpmlint.spec b/rpmlint.spec
index e5c226c..eb233cc 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -23,7 +23,7 @@ Name:           rpmlint
 BuildRequires:  rpm-python
 Summary:        Rpm correctness checker
 Version:        0.95
-Release:        8
+Release:        9
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        config
 Source1001:     config.in
diff --git a/suse-hide-unstripped-outside-build.diff b/suse-hide-unstripped-outside-build.diff
index ec0a7e1..cdc6112 100644
--- a/suse-hide-unstripped-outside-build.diff
+++ b/suse-hide-unstripped-outside-build.diff
@@ -10,14 +10,13 @@ Index: BinariesCheck.py
  
  import rpm
  
-@@ -264,7 +265,9 @@ class BinariesCheck(AbstractCheck.Abstra
+@@ -271,7 +272,8 @@ class BinariesCheck(AbstractCheck.Abstra
  
                      # stripped ?
                      if not is_ocaml_native and not unstrippable.search(fname):
 -                        if 'not stripped' in pkgfile.magic:
 +                        if 'not stripped' in pkgfile.magic and \
-+                            (os.environ.get('BUILD_IS_RUNNING', None) == None or \
-+                            os.environ.get('BUILD_DEBUG_FLAGS','').find('-g') != -1):
++                                os.environ.get('BUILD_DIR', None) == None:
                              printWarning(
                                  pkg, 'unstripped-binary-or-object', fname)