diff --git a/ChangeLog b/ChangeLog
index ace93dcaa7..e98dfe3ac8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar  7 11:43:34 1999  ape@spacetec.no  (Asbjorn Pettersen)
+
+	* gtk/gtkthemes.c (gtk_theme_engine_get): Add OS/2 changes.
+	Added function gen_8_3_dll_name(gchar *name, gchar *fullname).
+
 Fri Mar  5 09:12:24 1999  ape@lrdpf.spacetec.no  (Asbjorn Pettersen)
 
 	* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): Open file in
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ace93dcaa7..e98dfe3ac8 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sun Mar  7 11:43:34 1999  ape@spacetec.no  (Asbjorn Pettersen)
+
+	* gtk/gtkthemes.c (gtk_theme_engine_get): Add OS/2 changes.
+	Added function gen_8_3_dll_name(gchar *name, gchar *fullname).
+
 Fri Mar  5 09:12:24 1999  ape@lrdpf.spacetec.no  (Asbjorn Pettersen)
 
 	* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): Open file in
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ace93dcaa7..e98dfe3ac8 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Mar  7 11:43:34 1999  ape@spacetec.no  (Asbjorn Pettersen)
+
+	* gtk/gtkthemes.c (gtk_theme_engine_get): Add OS/2 changes.
+	Added function gen_8_3_dll_name(gchar *name, gchar *fullname).
+
 Fri Mar  5 09:12:24 1999  ape@lrdpf.spacetec.no  (Asbjorn Pettersen)
 
 	* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): Open file in
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ace93dcaa7..e98dfe3ac8 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sun Mar  7 11:43:34 1999  ape@spacetec.no  (Asbjorn Pettersen)
+
+	* gtk/gtkthemes.c (gtk_theme_engine_get): Add OS/2 changes.
+	Added function gen_8_3_dll_name(gchar *name, gchar *fullname).
+
 Fri Mar  5 09:12:24 1999  ape@lrdpf.spacetec.no  (Asbjorn Pettersen)
 
 	* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): Open file in
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ace93dcaa7..e98dfe3ac8 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Mar  7 11:43:34 1999  ape@spacetec.no  (Asbjorn Pettersen)
+
+	* gtk/gtkthemes.c (gtk_theme_engine_get): Add OS/2 changes.
+	Added function gen_8_3_dll_name(gchar *name, gchar *fullname).
+
 Fri Mar  5 09:12:24 1999  ape@lrdpf.spacetec.no  (Asbjorn Pettersen)
 
 	* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): Open file in
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ace93dcaa7..e98dfe3ac8 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Mar  7 11:43:34 1999  ape@spacetec.no  (Asbjorn Pettersen)
+
+	* gtk/gtkthemes.c (gtk_theme_engine_get): Add OS/2 changes.
+	Added function gen_8_3_dll_name(gchar *name, gchar *fullname).
+
 Fri Mar  5 09:12:24 1999  ape@lrdpf.spacetec.no  (Asbjorn Pettersen)
 
 	* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): Open file in
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ace93dcaa7..e98dfe3ac8 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Mar  7 11:43:34 1999  ape@spacetec.no  (Asbjorn Pettersen)
+
+	* gtk/gtkthemes.c (gtk_theme_engine_get): Add OS/2 changes.
+	Added function gen_8_3_dll_name(gchar *name, gchar *fullname).
+
 Fri Mar  5 09:12:24 1999  ape@lrdpf.spacetec.no  (Asbjorn Pettersen)
 
 	* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): Open file in
diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c
index 18801056f4..b92a218ae1 100644
--- a/gtk/gtkthemes.c
+++ b/gtk/gtkthemes.c
@@ -53,6 +53,17 @@ struct _GtkThemeEnginePrivate {
 
 static GHashTable *engine_hash = NULL;
 
+#ifdef __EMX__
+static void gen_8_3_dll_name(gchar *name, gchar *fullname)
+{
+    /* 8.3 dll filename restriction */
+    fullname[0] = '_';
+    strncpy (fullname + 1, name, 7);
+    fullname[8] = '\0';
+    strcat (fullname, ".dll");
+}                                                	
+#endif
+
 GtkThemeEngine*
 gtk_theme_engine_get (gchar *name)
 {
@@ -71,8 +82,20 @@ gtk_theme_engine_get (gchar *name)
        gchar *engine_path;
        GModule *library;
       
+#ifndef __EMX__
        g_snprintf (fullname, 1024, "lib%s.so", name);
+#else
+       gen_8_3_dll_name(name, fullname);
+#endif
        engine_path = gtk_rc_find_module_in_path (fullname);
+#ifdef __EMX__
+       if (!engine_path)
+	 {
+	   /* try theme name without prefix '_' */
+	   memmove(fullname, fullname + 1, strlen(fullname));
+	   engine_path = gtk_rc_find_module_in_path (fullname);
+	 }
+#endif
 
        if (!engine_path)
 	 {