diff --git a/openldap2-client.changes b/openldap2-client.changes
index 1acdb3d..63712a1 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 13 17:25:25 CEST 2008 - ro@suse.de
+
+- try to fix build for buildservice
+  (BUILD_INCARNATION can be empty) 
+
 -------------------------------------------------------------------
 Mon Aug 11 11:06:08 CEST 2008 - rhafer@suse.de
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index e44fb88..1632cd1 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -42,7 +42,7 @@ Summary:        OpenLDAP Client Utilities
 %endif
 AutoReqProv:    on
 Version:        2.4.11
-Release:        7
+Release:        10
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        addonschema.tar.gz
@@ -232,7 +232,7 @@ make %{?jobs:-j%jobs}
 SLAPD_BASEPORT=10000
 if [ -f /.buildenv ] ; then
     . /.buildenv
-    SLAPD_BASEPORT=$(($SLAPD_BASEPORT + $BUILD_INCARNATION * 10))
+    SLAPD_BASEPORT=$(($SLAPD_BASEPORT + ${BUILD_INCARNATION:-0} * 10))
 fi
 export SLAPD_BASEPORT
 %ifnarch %arm alpha
@@ -487,6 +487,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 13 2008 ro@suse.de
+- try to fix build for buildservice
+  (BUILD_INCARNATION can be empty)
 * Mon Aug 11 2008 rhafer@suse.de
 - /usr/lib/sasl2/slapd.conf was moved to /etc/sasl2/slapd.conf
   (bnc#412652)
diff --git a/openldap2.changes b/openldap2.changes
index 1acdb3d..63712a1 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 13 17:25:25 CEST 2008 - ro@suse.de
+
+- try to fix build for buildservice
+  (BUILD_INCARNATION can be empty) 
+
 -------------------------------------------------------------------
 Mon Aug 11 11:06:08 CEST 2008 - rhafer@suse.de
 
diff --git a/openldap2.spec b/openldap2.spec
index 109e8f9..9af3fc7 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -42,7 +42,7 @@ Summary:        The OpenLDAP Server
 %endif
 AutoReqProv:    on
 Version:        2.4.11
-Release:        9
+Release:        11
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        addonschema.tar.gz
@@ -235,7 +235,7 @@ make %{?jobs:-j%jobs}
 SLAPD_BASEPORT=10000
 if [ -f /.buildenv ] ; then
     . /.buildenv
-    SLAPD_BASEPORT=$(($SLAPD_BASEPORT + $BUILD_INCARNATION * 10))
+    SLAPD_BASEPORT=$(($SLAPD_BASEPORT + ${BUILD_INCARNATION:-0} * 10))
 fi
 export SLAPD_BASEPORT
 %ifnarch %arm alpha
@@ -490,6 +490,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 13 2008 ro@suse.de
+- try to fix build for buildservice
+  (BUILD_INCARNATION can be empty)
 * Mon Aug 11 2008 rhafer@suse.de
 - /usr/lib/sasl2/slapd.conf was moved to /etc/sasl2/slapd.conf
   (bnc#412652)