diff --git a/cmpi-provider-register.changes b/cmpi-provider-register.changes
index 32bae59..95cf950 100644
--- a/cmpi-provider-register.changes
+++ b/cmpi-provider-register.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 29 13:04:38 UTC 2015 - pwieczorkiewicz@suse.com
+
+- Do not put empty element (ie the current dir) in LD_LIBRARY_PATH
+  if LD_LIBRARY_PATH is set but empty (bsc#642831)
+
 -------------------------------------------------------------------
 Sun Nov  9 07:07:58 UTC 2014 - bwiedemann@suse.com
 
diff --git a/cmpi-provider-register.py b/cmpi-provider-register.py
index 1c1248d..f67e79e 100644
--- a/cmpi-provider-register.py
+++ b/cmpi-provider-register.py
@@ -379,7 +379,7 @@ if __name__ == '__main__':
             env = os.environ.copy()
             ldp = '%(h)s/lib:%(h)s/lib/providers:%(h)s/lib/providers/ext' % \
                             {'h':scx_home}
-            if 'LD_LIBRARY_PATH' in env:
+            if 'LD_LIBRARY_PATH' in env and env['LD_LIBRARY_PATH']:
                 ldp+= ':' + env['LD_LIBRARY_PATH']
             env['LD_LIBRARY_PATH'] = ldp
 
diff --git a/cmpi-provider-register.spec b/cmpi-provider-register.spec
index 853f1e2..9b55690 100644
--- a/cmpi-provider-register.spec
+++ b/cmpi-provider-register.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cmpi-provider-register
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed