diff --git a/ChangeLog b/ChangeLog
index e98dfe3ac8d6fc936620526713a75ff3b8508636..43b0e345d7ba06c37393b5160a24f0f920dae607 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar  7 18:46:37 1999  ape@lrdpf.spacetec.no  (Asbjorn Pettersen)
+
+	* gtk/gtkmain.c (add_dll_suffix): Add this function (OS/2 ver.)
+
 Sun Mar  7 11:43:34 1999  ape@spacetec.no  (Asbjorn Pettersen)
 
 	* gtk/gtkthemes.c (gtk_theme_engine_get): Add OS/2 changes.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e98dfe3ac8d6fc936620526713a75ff3b8508636..43b0e345d7ba06c37393b5160a24f0f920dae607 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Sun Mar  7 18:46:37 1999  ape@lrdpf.spacetec.no  (Asbjorn Pettersen)
+
+	* gtk/gtkmain.c (add_dll_suffix): Add this function (OS/2 ver.)
+
 Sun Mar  7 11:43:34 1999  ape@spacetec.no  (Asbjorn Pettersen)
 
 	* gtk/gtkthemes.c (gtk_theme_engine_get): Add OS/2 changes.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e98dfe3ac8d6fc936620526713a75ff3b8508636..43b0e345d7ba06c37393b5160a24f0f920dae607 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Sun Mar  7 18:46:37 1999  ape@lrdpf.spacetec.no  (Asbjorn Pettersen)
+
+	* gtk/gtkmain.c (add_dll_suffix): Add this function (OS/2 ver.)
+
 Sun Mar  7 11:43:34 1999  ape@spacetec.no  (Asbjorn Pettersen)
 
 	* gtk/gtkthemes.c (gtk_theme_engine_get): Add OS/2 changes.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e98dfe3ac8d6fc936620526713a75ff3b8508636..43b0e345d7ba06c37393b5160a24f0f920dae607 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Sun Mar  7 18:46:37 1999  ape@lrdpf.spacetec.no  (Asbjorn Pettersen)
+
+	* gtk/gtkmain.c (add_dll_suffix): Add this function (OS/2 ver.)
+
 Sun Mar  7 11:43:34 1999  ape@spacetec.no  (Asbjorn Pettersen)
 
 	* gtk/gtkthemes.c (gtk_theme_engine_get): Add OS/2 changes.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e98dfe3ac8d6fc936620526713a75ff3b8508636..43b0e345d7ba06c37393b5160a24f0f920dae607 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Sun Mar  7 18:46:37 1999  ape@lrdpf.spacetec.no  (Asbjorn Pettersen)
+
+	* gtk/gtkmain.c (add_dll_suffix): Add this function (OS/2 ver.)
+
 Sun Mar  7 11:43:34 1999  ape@spacetec.no  (Asbjorn Pettersen)
 
 	* gtk/gtkthemes.c (gtk_theme_engine_get): Add OS/2 changes.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e98dfe3ac8d6fc936620526713a75ff3b8508636..43b0e345d7ba06c37393b5160a24f0f920dae607 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Sun Mar  7 18:46:37 1999  ape@lrdpf.spacetec.no  (Asbjorn Pettersen)
+
+	* gtk/gtkmain.c (add_dll_suffix): Add this function (OS/2 ver.)
+
 Sun Mar  7 11:43:34 1999  ape@spacetec.no  (Asbjorn Pettersen)
 
 	* gtk/gtkthemes.c (gtk_theme_engine_get): Add OS/2 changes.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e98dfe3ac8d6fc936620526713a75ff3b8508636..43b0e345d7ba06c37393b5160a24f0f920dae607 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Sun Mar  7 18:46:37 1999  ape@lrdpf.spacetec.no  (Asbjorn Pettersen)
+
+	* gtk/gtkmain.c (add_dll_suffix): Add this function (OS/2 ver.)
+
 Sun Mar  7 11:43:34 1999  ape@spacetec.no  (Asbjorn Pettersen)
 
 	* gtk/gtkthemes.c (gtk_theme_engine_get): Add OS/2 changes.
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 08f1e44120b036bc764b9a7fa53a794b1ef33336..3c3523ea2cf906d8e1c970235e5b1c1540f57f2e 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -173,6 +173,21 @@ gtk_check_version (guint required_major,
   return NULL;
 }
 
+#ifdef __EMX__
+static gchar *add_dll_suffix(gchar *module_name)
+{
+    gchar *suffix = strrchr(module_name, '.');
+    
+    if (!suffix || stricmp(suffix, ".dll"))
+    {
+	gchar *old = module_name;
+	  
+	module_name = g_strconcat (module_name, ".dll", NULL);
+	g_free (old);
+    }
+    return (module_name);
+}
+#endif
 
 gboolean
 gtk_init_check (int	 *argc,
@@ -217,7 +232,11 @@ gtk_init_check (int	 *argc,
     {
       gchar **modules, **as;
 
+#ifndef __EMX__
       modules = g_strsplit (env_string, ":", -1);
+#else
+      modules = g_strsplit (env_string, ";", -1);
+#endif
       for (as = modules; *as; as++)
 	{
 	  if (**as)
@@ -334,6 +353,7 @@ gtk_init_check (int	 *argc,
       
       module_name = slist->data;
       slist->data = NULL;
+#ifndef __EMX__
       if (!(module_name[0] == '/' ||
 	    (module_name[0] == 'l' &&
 	     module_name[1] == 'i' &&
@@ -344,6 +364,9 @@ gtk_init_check (int	 *argc,
 	  module_name = g_strconcat ("lib", module_name, ".so", NULL);
 	  g_free (old);
 	}
+#else
+      module_name = add_dll_suffix(module_name);
+#endif
       if (g_module_supported ())
 	{
 	  module = g_module_open (module_name, G_MODULE_BIND_LAZY);