diff --git a/create_all_tarballs b/create_all_tarballs
index 33d8a40..81a7444 100755
--- a/create_all_tarballs
+++ b/create_all_tarballs
@@ -77,10 +77,13 @@ fi
 
 # Set target version
 if [ -z "$TARGET" ]; then
-    if [ -f main/tdelibs/tdecore/tdeversion.h ]; then
+    if [ -f main/core/tdelibs/tdecore/tdeversion.h ]; then
+        tdeversionHeader=main/core/tdelibs/tdecore/tdeversion.h
+    elif [ -f main/core/tdelibs/kdecore/kdeversion.h ]; then
+        tdeversionHeader=main/core/tdelibs/kdecore/kdeversion.h
+    elif [ -f main/tdelibs/tdecore/tdeversion.h ]; then
         tdeversionHeader=main/tdelibs/tdecore/tdeversion.h
-    fi
-    if [ -f main/tdelibs/kdecore/kdeversion.h ]; then
+    elif [ -f main/tdelibs/kdecore/kdeversion.h ]; then
         tdeversionHeader=main/tdelibs/kdecore/kdeversion.h
     fi
     if [ -z "$tdeversionHeader" ]; then
diff --git a/create_tarball b/create_tarball
index 282225d..11bd9ee 100755
--- a/create_tarball
+++ b/create_tarball
@@ -57,10 +57,13 @@ MODULE=${SUBROOT#$TDEROOT/main/}
 
 # Set target version
 if [ -z "$TARGET" ]; then
-    if [ -f $TDEROOT/main/tdelibs/tdecore/tdeversion.h ]; then
+    if [ -f $TDEROOT/main/core/tdelibs/tdecore/tdeversion.h ]; then
+        tdeversionHeader=$TDEROOT/main/core/tdelibs/tdecore/tdeversion.h
+    elif [ -f $TDEROOT/main/core/tdelibs/kdecore/kdeversion.h ]; then
+        tdeversionHeader=$TDEROOT/main/core/tdelibs/kdecore/kdeversion.h
+    elif [ -f $TDEROOT/main/tdelibs/tdecore/tdeversion.h ]; then
         tdeversionHeader=$TDEROOT/main/tdelibs/tdecore/tdeversion.h
-    fi
-    if [ -f $TDEROOT/main/tdelibs/kdecore/kdeversion.h ]; then
+    elif [ -f $TDEROOT/main/tdelibs/kdecore/kdeversion.h ]; then
         tdeversionHeader=$TDEROOT/main/tdelibs/kdecore/kdeversion.h
     fi
     if [ -z "$tdeversionHeader" ]; then