diff --git a/ChangeLog b/ChangeLog
index ca63791be..c39f9cf01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-11  Tor Lillqvist  <tml@iki.fi>
+
+	* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin
+	subdirectory, so get them from there.
+
+	* glib/gwin32.c (g_win32_getlocale): Use "sr@Latn" and "sr" in the
+	same way as the po files for Serbian in Latin and Cyrillic script.
+
 2003-06-11  Sebastian Wilhelmi  <seppi@seppi.de>
 
 	* configure.in: Remove false &. Spotted by Albert Chin
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ca63791be..c39f9cf01 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2003-06-11  Tor Lillqvist  <tml@iki.fi>
+
+	* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin
+	subdirectory, so get them from there.
+
+	* glib/gwin32.c (g_win32_getlocale): Use "sr@Latn" and "sr" in the
+	same way as the po files for Serbian in Latin and Cyrillic script.
+
 2003-06-11  Sebastian Wilhelmi  <seppi@seppi.de>
 
 	* configure.in: Remove false &. Spotted by Albert Chin
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index ca63791be..c39f9cf01 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2003-06-11  Tor Lillqvist  <tml@iki.fi>
+
+	* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin
+	subdirectory, so get them from there.
+
+	* glib/gwin32.c (g_win32_getlocale): Use "sr@Latn" and "sr" in the
+	same way as the po files for Serbian in Latin and Cyrillic script.
+
 2003-06-11  Sebastian Wilhelmi  <seppi@seppi.de>
 
 	* configure.in: Remove false &. Spotted by Albert Chin
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ca63791be..c39f9cf01 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2003-06-11  Tor Lillqvist  <tml@iki.fi>
+
+	* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin
+	subdirectory, so get them from there.
+
+	* glib/gwin32.c (g_win32_getlocale): Use "sr@Latn" and "sr" in the
+	same way as the po files for Serbian in Latin and Cyrillic script.
+
 2003-06-11  Sebastian Wilhelmi  <seppi@seppi.de>
 
 	* configure.in: Remove false &. Spotted by Albert Chin
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ca63791be..c39f9cf01 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2003-06-11  Tor Lillqvist  <tml@iki.fi>
+
+	* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin
+	subdirectory, so get them from there.
+
+	* glib/gwin32.c (g_win32_getlocale): Use "sr@Latn" and "sr" in the
+	same way as the po files for Serbian in Latin and Cyrillic script.
+
 2003-06-11  Sebastian Wilhelmi  <seppi@seppi.de>
 
 	* configure.in: Remove false &. Spotted by Albert Chin
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ca63791be..c39f9cf01 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2003-06-11  Tor Lillqvist  <tml@iki.fi>
+
+	* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin
+	subdirectory, so get them from there.
+
+	* glib/gwin32.c (g_win32_getlocale): Use "sr@Latn" and "sr" in the
+	same way as the po files for Serbian in Latin and Cyrillic script.
+
 2003-06-11  Sebastian Wilhelmi  <seppi@seppi.de>
 
 	* configure.in: Remove false &. Spotted by Albert Chin
diff --git a/glib-zip.in b/glib-zip.in
index 3ea740ddc..fa7f9bc36 100755
--- a/glib-zip.in
+++ b/glib-zip.in
@@ -9,13 +9,13 @@ DEVZIP=/tmp/glib-dev-@GLIB_VERSION@.zip
 cd @prefix@
 
 rm $ZIP
-zip -r $ZIP -@ <<EOF
+zip $ZIP -@ <<EOF
 COPYING.LIB-2
 bin/gspawn-win32-helper.exe
-lib/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
-lib/libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll
-lib/libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll
-lib/libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll
+bin/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
+bin/libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll
+bin/libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll
+bin/libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll
 EOF
 
 zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo
diff --git a/glib/gwin32.c b/glib/gwin32.c
index 9df2c6dfe..324ae0954 100644
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -199,19 +199,12 @@ g_win32_getlocale (void)
 #endif
 	}
       break;
-    case LANG_CROATIAN:		/* LANG_CROATIAN == LANG_SERBIAN
-				 * What used to be called Serbo-Croatian
-				 * should really now be two separate
-				 * languages because of political reasons.
-				 * (Says tml, who knows nothing about Serbian
-				 * or Croatian.)
-				 * (I can feel those flames coming already.)
-				 */
+    case LANG_CROATIAN:		/* LANG_CROATIAN == LANG_SERBIAN */
       switch (sub)
 	{
 	/* FIXME: How to distinguish Croatian and Latin Serbian locales?  */
-	case SUBLANG_SERBIAN_LATIN: l = "sr"; break;
-	case SUBLANG_SERBIAN_CYRILLIC: l = "sr"; sl = "@cyrillic"; break;
+	case SUBLANG_SERBIAN_LATIN: l = "sr"; sl = "@Latn"; break;
+	case SUBLANG_SERBIAN_CYRILLIC: l = "sr"; break;
 	default: l = "hr"; sl = "HR";
 	}
       break;