diff --git a/ChangeLog b/ChangeLog
index 3de804091..21ad26baf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-07  Mike Kestner  <mkestner@novell.com>
+
+	* */*.cs : s/glue-2.0/glue-2 so that dllimport works on win32.
+	* */*.custom : s/glue-2.0/glue-2
+	* */glue/makefile.win32 : s/glue-2.0/glue-2
+	* */glue/Makefile.am : s/glue-2.0/glue-2
+
 2004-12-06  John Luke  <john.luke@gmail.com>
 
 	* gtk/Gtk.metadata: set with_mnemonic as the preferred ctor
diff --git a/atk/glue/Makefile.am b/atk/glue/Makefile.am
index fdf65430e..451de0c3a 100644
--- a/atk/glue/Makefile.am
+++ b/atk/glue/Makefile.am
@@ -1,20 +1,20 @@
-lib_LTLIBRARIES = libatksharpglue-2.0.la
+lib_LTLIBRARIES = libatksharpglue-2.la
 
-libatksharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined
+libatksharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
 
-libatksharpglue_2_0_la_SOURCES = 	\
+libatksharpglue_2_la_SOURCES = 	\
 	generated.c		\
 	vmglueheaders.h
 
 # Adding a new glue file?
 # Please remember to update makefile.win32
 
-libatksharpglue_2_0_la_LIBADD = $(BASE_DEPENDENCIES_LIBS)
+libatksharpglue_2_la_LIBADD = $(BASE_DEPENDENCIES_LIBS)
 
 INCLUDES = $(BASE_DEPENDENCIES_CFLAGS) -I$(top_srcdir)
 
-libatksharpglue.dll: $(libatksharpglue_2_0_la_OBJECTS) libatksharpglue.rc libatksharpglue.def
-	./build-dll libatksharpglue-2.0 $(VERSION)
+libatksharpglue.dll: $(libatksharpglue_2_la_OBJECTS) libatksharpglue.rc libatksharpglue.def
+	./build-dll libatksharpglue-2 $(VERSION)
 
 CLEANFILES = lib*.a lib*.dll
 
diff --git a/atk/glue/makefile.win32 b/atk/glue/makefile.win32
index 61b57ac0e..a157024f1 100755
--- a/atk/glue/makefile.win32
+++ b/atk/glue/makefile.win32
@@ -7,16 +7,16 @@ GLUE_OBJS = \
 	generated.o		\
 	win32dll.o
 
-all: atksharpglue-2.0.dll
+all: atksharpglue-2.dll
 
 
 %.o: %.c
 	$(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ 
 
 
-atksharpglue-2.0.dll: $(GLUE_OBJS)
-	$(DLLWRAP) --output-lib=libatksharpglue-2.0.a --dllname=atksharpglue-2.0.dll --driver-name=gcc --output-def=atksharpglue.def $(GLUE_OBJS) $(GTK_LIBS)
+atksharpglue-2.dll: $(GLUE_OBJS)
+	$(DLLWRAP) --output-lib=libatksharpglue-2.a --dllname=atksharpglue-2.dll --driver-name=gcc --output-def=atksharpglue.def $(GLUE_OBJS) $(GTK_LIBS)
 
 
 clean:
-	rm -f atksharpglue-2.0.dll *.o libatksharpglue-2.0.a
+	rm -f atksharpglue-2.dll *.o libatksharpglue-2.a
diff --git a/gdk/Device.custom b/gdk/Device.custom
index 747d7fb9e..afb544f92 100644
--- a/gdk/Device.custom
+++ b/gdk/Device.custom
@@ -19,28 +19,28 @@
 // Boston, MA 02111-1307, USA.
 
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_device_get_name (IntPtr device);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern InputSource gtksharp_gdk_device_get_source (IntPtr device);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern InputMode gtksharp_gdk_device_get_mode (IntPtr device);
 
-		[DllImport("gdksharpglue-2.0")]		
+		[DllImport("gdksharpglue-2")]		
 		static extern bool gtksharp_gdk_device_has_cursor (IntPtr device);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern int gtksharp_gdk_device_get_num_axes (IntPtr device);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern int gtksharp_gdk_device_get_num_keys (IntPtr device);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern DeviceAxis gtksharp_gdk_device_get_device_axis (IntPtr device, uint axis);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern DeviceKey gtksharp_gdk_device_get_device_key (IntPtr device, uint axis);
 
 		[DllImport("libgdk-win32-2.0-0.dll")]
diff --git a/gdk/DragContext.custom b/gdk/DragContext.custom
index 5349bc5eb..f634fa836 100644
--- a/gdk/DragContext.custom
+++ b/gdk/DragContext.custom
@@ -20,7 +20,7 @@
 // Boston, MA 02111-1307, USA.
 
 
-[DllImport("gdksharpglue-2.0")]
+[DllImport("gdksharpglue-2")]
 static extern DragProtocol gtksharp_drag_context_get_protocol (IntPtr ptr);
 
 public unsafe DragProtocol DragProtocol {
@@ -30,7 +30,7 @@ public unsafe DragProtocol DragProtocol {
 }
 
 
-[DllImport("gdksharpglue-2.0")]
+[DllImport("gdksharpglue-2")]
 static extern bool gtksharp_drag_context_get_is_source (IntPtr ptr);
 
 public bool IsSource {
@@ -40,7 +40,7 @@ public bool IsSource {
 }
 
 
-[DllImport("gdksharpglue-2.0")]
+[DllImport("gdksharpglue-2")]
 static extern IntPtr gtksharp_drag_context_get_source_window (IntPtr ptr);
 
 public Gdk.Window SourceWindow {
@@ -50,7 +50,7 @@ public Gdk.Window SourceWindow {
 }
 
 
-[DllImport("gdksharpglue-2.0")]
+[DllImport("gdksharpglue-2")]
 static extern IntPtr gtksharp_drag_context_get_dest_window (IntPtr ptr);
 
 public Gdk.Window DestWindow {
@@ -60,7 +60,7 @@ public Gdk.Window DestWindow {
 }
 
 
-[DllImport("gdksharpglue-2.0")]
+[DllImport("gdksharpglue-2")]
 static extern IntPtr gtksharp_drag_context_get_targets (IntPtr ptr);
 
 public Atom [] Targets {
@@ -78,7 +78,7 @@ public Atom [] Targets {
 }
 
 
-[DllImport("gdksharpglue-2.0")]
+[DllImport("gdksharpglue-2")]
 static extern DragAction gtksharp_drag_context_get_actions (IntPtr ptr);
 
 public DragAction Actions {
@@ -87,7 +87,7 @@ public DragAction Actions {
 	}
 }
 
-[DllImport("gdksharpglue-2.0")]
+[DllImport("gdksharpglue-2")]
 static extern DragAction gtksharp_drag_context_get_suggested_action (IntPtr ptr);
 
 public DragAction SuggestedAction {
@@ -97,7 +97,7 @@ public DragAction SuggestedAction {
 }
 
 
-[DllImport("gdksharpglue-2.0")]
+[DllImport("gdksharpglue-2")]
 static extern DragAction gtksharp_drag_context_get_action (IntPtr ptr);
 
 public DragAction Action {
@@ -107,7 +107,7 @@ public DragAction Action {
 }
 
 
-[DllImport("gdksharpglue-2.0")]
+[DllImport("gdksharpglue-2")]
 static extern uint gtksharp_drag_context_get_start_time (IntPtr ptr);
 
 public uint StartTime {
diff --git a/gdk/Event.cs b/gdk/Event.cs
index 2928f0371..228d9da71 100644
--- a/gdk/Event.cs
+++ b/gdk/Event.cs
@@ -28,13 +28,13 @@ namespace Gdk {
 
 	public class Event : GLib.IWrapper {
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern EventType gtksharp_gdk_event_get_event_type (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_event_get_window (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern sbyte gtksharp_gdk_event_get_send_event (IntPtr evt);
 
 		[DllImport("libgdk-win32-2.0-0.dll")]
diff --git a/gdk/EventButton.cs b/gdk/EventButton.cs
index 4f081efda..d94befb8e 100644
--- a/gdk/EventButton.cs
+++ b/gdk/EventButton.cs
@@ -25,31 +25,31 @@ namespace Gdk {
 
 	public class EventButton : Event {
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_button_get_time (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern double gtksharp_gdk_event_button_get_x (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern double gtksharp_gdk_event_button_get_y (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern double gtksharp_gdk_event_button_get_x_root (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern double gtksharp_gdk_event_button_get_y_root (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_button_get_state (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_button_get_button (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_event_button_get_device (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_event_button_get_axes (IntPtr evt);
 
 		public EventButton (IntPtr raw) : base (raw) {} 
diff --git a/gdk/EventClient.cs b/gdk/EventClient.cs
index 012170fca..c388aed93 100644
--- a/gdk/EventClient.cs
+++ b/gdk/EventClient.cs
@@ -26,16 +26,16 @@ namespace Gdk {
 
 	public class EventClient : Event {
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_client_get_time (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_event_client_get_message_type (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern ushort gtksharp_gdk_event_client_get_data_format (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_event_client_get_data (IntPtr evt);
 
 		public EventClient (IntPtr raw) : base (raw) {} 
diff --git a/gdk/EventConfigure.cs b/gdk/EventConfigure.cs
index 80bec4b2a..498e6cdbb 100644
--- a/gdk/EventConfigure.cs
+++ b/gdk/EventConfigure.cs
@@ -26,16 +26,16 @@ namespace Gdk {
 
 	public class EventConfigure : Event {
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern int gtksharp_gdk_event_configure_get_x (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern int gtksharp_gdk_event_configure_get_y (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern int gtksharp_gdk_event_configure_get_width (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern int gtksharp_gdk_event_configure_get_height (IntPtr evt);
 
 		public EventConfigure (IntPtr raw) : base (raw) {} 
diff --git a/gdk/EventCrossing.cs b/gdk/EventCrossing.cs
index 9883fca5a..ff3a5d062 100644
--- a/gdk/EventCrossing.cs
+++ b/gdk/EventCrossing.cs
@@ -26,34 +26,34 @@ namespace Gdk {
 
 	public class EventCrossing : Event {
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_crossing_get_time (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern double gtksharp_gdk_event_crossing_get_x (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern double gtksharp_gdk_event_crossing_get_y (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern double gtksharp_gdk_event_crossing_get_x_root (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern double gtksharp_gdk_event_crossing_get_y_root (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_crossing_get_state (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_event_crossing_get_subwindow (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern CrossingMode gtksharp_gdk_event_crossing_get_mode (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern NotifyType gtksharp_gdk_event_crossing_get_detail (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern bool gtksharp_gdk_event_crossing_get_focus (IntPtr evt);
 
 		public EventCrossing (IntPtr raw) : base (raw) {} 
diff --git a/gdk/EventDND.cs b/gdk/EventDND.cs
index 2c5436b0a..01bc21c03 100644
--- a/gdk/EventDND.cs
+++ b/gdk/EventDND.cs
@@ -26,16 +26,16 @@ namespace Gdk {
 
 	public class EventDND : Event {
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_dnd_get_time (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_event_dnd_get_context (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern short gtksharp_gdk_event_dnd_get_x_root (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern short gtksharp_gdk_event_dnd_get_y_root (IntPtr evt);
 
 		public EventDND (IntPtr raw) : base (raw) {} 
diff --git a/gdk/EventExpose.cs b/gdk/EventExpose.cs
index dfb4c6a08..b449a68c8 100644
--- a/gdk/EventExpose.cs
+++ b/gdk/EventExpose.cs
@@ -26,13 +26,13 @@ namespace Gdk {
 
 	public class EventExpose : Event {
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern Rectangle gtksharp_gdk_event_expose_get_area (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_event_expose_get_region (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern int gtksharp_gdk_event_expose_get_count (IntPtr evt);
 
 		public EventExpose (IntPtr raw) : base (raw) {} 
diff --git a/gdk/EventFocus.cs b/gdk/EventFocus.cs
index 7a991c4e0..523af3dec 100644
--- a/gdk/EventFocus.cs
+++ b/gdk/EventFocus.cs
@@ -26,7 +26,7 @@ namespace Gdk {
 
 	public class EventFocus : Event {
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern short gtksharp_gdk_event_focus_get_in (IntPtr evt);
 
 		public EventFocus (IntPtr raw) : base (raw) {} 
diff --git a/gdk/EventKey.cs b/gdk/EventKey.cs
index a83287527..4769fda35 100644
--- a/gdk/EventKey.cs
+++ b/gdk/EventKey.cs
@@ -26,19 +26,19 @@ namespace Gdk {
 
 	public class EventKey : Event {
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_key_get_time (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_key_get_state (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_key_get_keyval (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern ushort gtksharp_gdk_event_key_get_hardware_keycode (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern byte gtksharp_gdk_event_key_get_group (IntPtr evt);
 
 		public EventKey (IntPtr raw) : base (raw) {} 
diff --git a/gdk/EventMotion.cs b/gdk/EventMotion.cs
index 18acb556d..4f6a75505 100644
--- a/gdk/EventMotion.cs
+++ b/gdk/EventMotion.cs
@@ -26,31 +26,31 @@ namespace Gdk {
 
 	public class EventMotion : Event {
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_motion_get_time (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern double gtksharp_gdk_event_motion_get_x (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern double gtksharp_gdk_event_motion_get_y (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern double gtksharp_gdk_event_motion_get_x_root (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern double gtksharp_gdk_event_motion_get_y_root (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_motion_get_state (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern ushort gtksharp_gdk_event_motion_get_is_hint (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_event_motion_get_device (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_event_motion_get_axes (IntPtr evt);
 
 		public EventMotion (IntPtr raw) : base (raw) {} 
diff --git a/gdk/EventProperty.cs b/gdk/EventProperty.cs
index f66fc19f0..f6787bc50 100644
--- a/gdk/EventProperty.cs
+++ b/gdk/EventProperty.cs
@@ -26,13 +26,13 @@ namespace Gdk {
 
 	public class EventProperty : Event {
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_property_get_time (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_event_property_get_atom (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern PropertyState gtksharp_gdk_event_property_get_state (IntPtr evt);
 
 		public EventProperty (IntPtr raw) : base (raw) {} 
diff --git a/gdk/EventProximity.cs b/gdk/EventProximity.cs
index 8b59f397d..81c54289c 100644
--- a/gdk/EventProximity.cs
+++ b/gdk/EventProximity.cs
@@ -26,10 +26,10 @@ namespace Gdk {
 
 	public class EventProximity : Event {
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_proximity_get_time (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_event_proximity_get_device (IntPtr evt);
 
 		public EventProximity (IntPtr raw) : base (raw) {} 
diff --git a/gdk/EventScroll.cs b/gdk/EventScroll.cs
index 2455aaa6e..1dba1ec8f 100644
--- a/gdk/EventScroll.cs
+++ b/gdk/EventScroll.cs
@@ -26,28 +26,28 @@ namespace Gdk {
 
 	public class EventScroll : Event {
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_scroll_get_time (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern double gtksharp_gdk_event_scroll_get_x (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern double gtksharp_gdk_event_scroll_get_y (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern double gtksharp_gdk_event_scroll_get_x_root (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern double gtksharp_gdk_event_scroll_get_y_root (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_scroll_get_state (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern ScrollDirection gtksharp_gdk_event_scroll_get_direction (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_event_scroll_get_device (IntPtr evt);
 
 		public EventScroll (IntPtr raw) : base (raw) {} 
diff --git a/gdk/EventSelection.cs b/gdk/EventSelection.cs
index 1df9fe64b..dbd793df9 100644
--- a/gdk/EventSelection.cs
+++ b/gdk/EventSelection.cs
@@ -26,19 +26,19 @@ namespace Gdk {
 
 	public class EventSelection : Event {
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_selection_get_time (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_event_selection_get_selection (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_event_selection_get_target (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_event_selection_get_property (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern uint gtksharp_gdk_event_selection_get_requestor (IntPtr evt);
 
 		public EventSelection (IntPtr raw) : base (raw) {} 
diff --git a/gdk/EventSetting.cs b/gdk/EventSetting.cs
index adc0ad441..3a1e2949e 100644
--- a/gdk/EventSetting.cs
+++ b/gdk/EventSetting.cs
@@ -26,10 +26,10 @@ namespace Gdk {
 
 	public class EventSetting : Event {
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern SettingAction gtksharp_gdk_event_setting_get_action (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern IntPtr gtksharp_gdk_event_setting_get_name (IntPtr evt);
 
 		public EventSetting (IntPtr raw) : base (raw) {} 
diff --git a/gdk/EventVisibility.cs b/gdk/EventVisibility.cs
index 6da96ee65..e80ec5d92 100644
--- a/gdk/EventVisibility.cs
+++ b/gdk/EventVisibility.cs
@@ -26,7 +26,7 @@ namespace Gdk {
 
 	public class EventVisibility : Event {
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern VisibilityState gtksharp_gdk_event_visibility_get_state (IntPtr evt);
 
 		public EventVisibility (IntPtr raw) : base (raw) {} 
diff --git a/gdk/EventWindowState.cs b/gdk/EventWindowState.cs
index 23a9ebbbc..9718b9bc5 100644
--- a/gdk/EventWindowState.cs
+++ b/gdk/EventWindowState.cs
@@ -26,10 +26,10 @@ namespace Gdk {
 
 	public class EventWindowState : Event {
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern WindowState gtksharp_gdk_event_window_state_get_changed_mask (IntPtr evt);
 
-		[DllImport("gdksharpglue-2.0")]
+		[DllImport("gdksharpglue-2")]
 		static extern WindowState gtksharp_gdk_event_window_state_get_new_window_state (IntPtr evt);
 
 		public EventWindowState (IntPtr raw) : base (raw) {} 
diff --git a/gdk/Global.custom b/gdk/Global.custom
index 24ad9a6b9..9a2536b8b 100644
--- a/gdk/Global.custom
+++ b/gdk/Global.custom
@@ -49,7 +49,7 @@
 			return result;
 		}
 
-		[DllImport ("gdksharpglue-2.0")]
+		[DllImport ("gdksharpglue-2")]
 		static extern IntPtr gtksharp_get_gdk_net_supported ();
 
 		public static Gdk.Atom[] SupportedWindowManagerHints {
@@ -66,7 +66,7 @@
 			}
 		}
 
-		[DllImport ("gdksharpglue-2.0")]
+		[DllImport ("gdksharpglue-2")]
 		static extern IntPtr gtksharp_get_gdk_net_client_list (out int count);
 
 		public static Gdk.Window[] WindowManagerClientWindows {
@@ -87,7 +87,7 @@
 			}
 		}
 
-		[DllImport ("gdksharpglue-2.0")]
+		[DllImport ("gdksharpglue-2")]
 		static extern int gtksharp_get_gdk_net_number_of_desktops ();
 
 		public static int NumberOfDesktops {
@@ -96,7 +96,7 @@
 			}
 		}
 
-		[DllImport ("gdksharpglue-2.0")]
+		[DllImport ("gdksharpglue-2")]
 		static extern int gtksharp_get_gdk_net_current_desktop ();
 
 		public static int CurrentDesktop {
@@ -105,7 +105,7 @@
 			}
 		}
 
-		[DllImport ("gdksharpglue-2.0")]
+		[DllImport ("gdksharpglue-2")]
 		static extern uint gtksharp_get_gdk_net_active_window ();
 
 		public static Gdk.Window ActiveWindow {
@@ -119,7 +119,7 @@
 			}
 		}
 
-		[DllImport ("gdksharpglue-2.0")]
+		[DllImport ("gdksharpglue-2")]
 		static extern IntPtr gtksharp_get_gdk_net_workarea ();
 
 		public static Gdk.Rectangle[] DesktopWorkareas {
diff --git a/gdk/Selection.custom b/gdk/Selection.custom
index 18d5fb19b..dd4837cf2 100644
--- a/gdk/Selection.custom
+++ b/gdk/Selection.custom
@@ -20,17 +20,17 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
-[DllImport("gdksharpglue-2.0")]
+[DllImport("gdksharpglue-2")]
 static extern IntPtr gtksharp_get_gdk_selection_primary ();
 
 public static Gdk.Atom Primary = new Gdk.Atom (gtksharp_get_gdk_selection_primary());
 
-[DllImport("gdksharpglue-2.0")]
+[DllImport("gdksharpglue-2")]
 static extern IntPtr gtksharp_get_gdk_selection_secondary ();
 
 public static Gdk.Atom Secondary = new Gdk.Atom (gtksharp_get_gdk_selection_secondary());
 
-[DllImport("gdksharpglue-2.0")]
+[DllImport("gdksharpglue-2")]
 static extern IntPtr gtksharp_get_gdk_selection_clipboard ();
 
 public static Gdk.Atom Clipboard = new Gdk.Atom (gtksharp_get_gdk_selection_clipboard());
diff --git a/gdk/glue/Makefile.am b/gdk/glue/Makefile.am
index 3e1f66a0d..96c811784 100644
--- a/gdk/glue/Makefile.am
+++ b/gdk/glue/Makefile.am
@@ -1,6 +1,6 @@
-lib_LTLIBRARIES = libgdksharpglue-2.0.la
+lib_LTLIBRARIES = libgdksharpglue-2.la
 
-libgdksharpglue_2_0_la_SOURCES =	\
+libgdksharpglue_2_la_SOURCES =	\
 	dragcontext.c		\
 	device.c		\
 	event.c			\
@@ -11,14 +11,14 @@ libgdksharpglue_2_0_la_SOURCES =	\
 # Adding a new glue file?
 # Please remember to update makefile.win32
 
-libgdksharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined
+libgdksharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
 
-libgdksharpglue_2_0_la_LIBADD = $(GTK_LIBS)
+libgdksharpglue_2_la_LIBADD = $(GTK_LIBS)
 
 INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir)
 
-libgdksharpglue.dll: $(libgdksharpglue_2_0_la_OBJECTS) libgdksharpglue.rc libgdksharpglue.def
-	./build-dll libgdksharpglue-2.0 $(VERSION)
+libgdksharpglue.dll: $(libgdksharpglue_2_la_OBJECTS) libgdksharpglue.rc libgdksharpglue.def
+	./build-dll libgdksharpglue-2 $(VERSION)
 
 CLEANFILES = lib*.a lib*.dll
 
diff --git a/gdk/glue/makefile.win32 b/gdk/glue/makefile.win32
index 1618a4f30..da81223a5 100755
--- a/gdk/glue/makefile.win32
+++ b/gdk/glue/makefile.win32
@@ -1,5 +1,5 @@
-GTK_CFLAGS=`pkg-config --cflags gtk+-win32-2.0 libglade-2.0`
-GTK_LIBS=`pkg-config --libs gtk+-win32-2.0 libglade-2.0`
+GTK_CFLAGS=`pkg-config --cflags gdk-win32-2.0`
+GTK_LIBS=`pkg-config --libs gdk-win32-2.0`
 CC=gcc -mno-cygwin -mms-bitfields
 DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-symbols
 
@@ -10,16 +10,16 @@ GLUE_OBJS = \
         selection.o             \
 	win32dll.o
 
-all: gdksharpglue-2.0.dll
+all: gdksharpglue-2.dll
 
 
 %.o: %.c
 	$(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ 
 
 
-gdksharpglue-2.0.dll: $(GLUE_OBJS)
-	$(DLLWRAP) --output-lib=libgdksharpglue-2.0.a --dllname=gdksharpglue-2.0.dll --driver-name=gcc --output-def=gdksharpglue.def $(GLUE_OBJS) $(GTK_LIBS)
+gdksharpglue-2.dll: $(GLUE_OBJS)
+	$(DLLWRAP) --output-lib=libgdksharpglue-2.a --dllname=gdksharpglue-2.dll --driver-name=gcc --output-def=gdksharpglue.def $(GLUE_OBJS) $(GTK_LIBS)
 
 
 clean:
-	rm -f gdksharpglue-2.0.dll *.o libgdksharpglue-2.0.a
+	rm -f gdksharpglue-2.dll *.o libgdksharpglue-2.a
diff --git a/generator/BoxedGen.cs b/generator/BoxedGen.cs
index 18640d3f0..c4906bd55 100644
--- a/generator/BoxedGen.cs
+++ b/generator/BoxedGen.cs
@@ -39,10 +39,10 @@ namespace GtkSharp.Generation {
 		{
 			StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
 			base.Generate (gen_info);
-			sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2.0\")]");
+			sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2\")]");
 			sw.WriteLine ("\t\tstatic extern IntPtr glibsharp_value_get_boxed (ref GLib.Value val);");
 			sw.WriteLine ();
-			sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2.0\")]");
+			sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2\")]");
 			sw.WriteLine ("\t\tstatic extern void glibsharp_value_set_boxed (ref GLib.Value val, ref " + QualifiedName + " boxed);");
 			sw.WriteLine ();
 			sw.WriteLine ("\t\tpublic static explicit operator GLib.Value (" + QualifiedName + " boxed)");
diff --git a/glade/XML.custom b/glade/XML.custom
index acd3a3803..65ec4a1a1 100644
--- a/glade/XML.custom
+++ b/glade/XML.custom
@@ -36,7 +36,7 @@
 			glade_set_custom_handler (callback_wrapper.NativeDelegate, IntPtr.Zero);
 		}
 
-		[DllImport("gladesharpglue-2.0")]
+		[DllImport("gladesharpglue-2")]
 		static extern IntPtr gtksharp_glade_xml_get_filename (IntPtr raw);
 
 		public string Filename {
diff --git a/glade/glue/Makefile.am b/glade/glue/Makefile.am
index a5ca0999f..b601317cd 100644
--- a/glade/glue/Makefile.am
+++ b/glade/glue/Makefile.am
@@ -1,22 +1,22 @@
 lib_LTLIBRARIES = $(TARGET)
 
 if ENABLE_GLADE
-TARGET = libgladesharpglue-2.0.la
+TARGET = libgladesharpglue-2.la
 else
 TARGET = 
 endif
 
-libgladesharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined
+libgladesharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
 
-libgladesharpglue_2_0_la_SOURCES = 	\
+libgladesharpglue_2_la_SOURCES = 	\
 	gladexml.c
 
-libgladesharpglue_2_0_la_LIBADD = $(GLADE_LIBS)
+libgladesharpglue_2_la_LIBADD = $(GLADE_LIBS)
 
 INCLUDES = $(GLADE_CFLAGS) -I$(top_srcdir)
 
-libgladesharpglue.dll: $(libgladesharpglue_2_0_la_OBJECTS) libgladesharpglue.rc libgladesharpglue.def
-	./build-dll libgladesharpglue-2.0 $(VERSION)
+libgladesharpglue.dll: $(libgladesharpglue_2_la_OBJECTS) libgladesharpglue.rc libgladesharpglue.def
+	./build-dll libgladesharpglue-2 $(VERSION)
 
 CLEANFILES = lib*.a lib*.dll
 
diff --git a/glade/glue/makefile.win32 b/glade/glue/makefile.win32
index bdd1e7c9c..34e05fd7c 100755
--- a/glade/glue/makefile.win32
+++ b/glade/glue/makefile.win32
@@ -7,16 +7,16 @@ GLUE_OBJS = \
 	gladexml.o              \
 	win32dll.o
 
-all: gladesharpglue-2.0.dll
+all: gladesharpglue-2.dll
 
 
 %.o: %.c
 	$(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ 
 
 
-gladesharpglue-2.0.dll: $(GLUE_OBJS)
-	$(DLLWRAP) --output-lib=libgladesharpglue-2.0.a --dllname=gladesharpglue-2.0.dll --driver-name=gcc --output-def=gladesharpglue.def $(GLUE_OBJS) $(GTK_LIBS)
+gladesharpglue-2.dll: $(GLUE_OBJS)
+	$(DLLWRAP) --output-lib=libgladesharpglue-2.a --dllname=gladesharpglue-2.dll --driver-name=gcc --output-def=gladesharpglue.def $(GLUE_OBJS) $(GTK_LIBS)
 
 
 clean:
-	rm -f gladesharpglue-2.0.dll *.o libgladesharpglue-2.0.a
+	rm -f gladesharpglue-2.dll *.o libgladesharpglue-2.a
diff --git a/glib/GException.cs b/glib/GException.cs
index 921b06add..b7ff14bcb 100644
--- a/glib/GException.cs
+++ b/glib/GException.cs
@@ -33,7 +33,7 @@ namespace GLib {
 			this.errptr = errptr;
 		}
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_error_get_message (IntPtr errptr);
 		public override string Message {
 			get {
diff --git a/glib/List.cs b/glib/List.cs
index 8dd00a9dd..73a730c30 100644
--- a/glib/List.cs
+++ b/glib/List.cs
@@ -34,7 +34,7 @@ namespace GLib {
 			return new List (g_list_copy (Handle));
 		}
 		
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_list_get_data (IntPtr l);
 		
 		internal override IntPtr GetData (IntPtr current)
@@ -42,7 +42,7 @@ namespace GLib {
 			return gtksharp_list_get_data (current);
 		}
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_list_get_next (IntPtr l);
 		
 		internal override IntPtr Next (IntPtr current)
diff --git a/glib/Marshaller.cs b/glib/Marshaller.cs
index b1e4a14e3..15fc961e0 100644
--- a/glib/Marshaller.cs
+++ b/glib/Marshaller.cs
@@ -173,7 +173,7 @@ namespace GLib {
 			return local_epoch.AddSeconds ((int)time_t + utc_offset);
 		}
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_unichar_to_utf8_string (uint c);
 
 		public static char GUnicharToChar (uint ucs4_char)
@@ -186,7 +186,7 @@ namespace GLib {
 			return ret [0];
 		}
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern uint glibsharp_utf16_to_gunichar (ushort c);
 
 		public static uint CharToGUnichar (char c)
diff --git a/glib/Object.cs b/glib/Object.cs
index da479f6ce..837e7178e 100644
--- a/glib/Object.cs
+++ b/glib/Object.cs
@@ -137,7 +137,7 @@ namespace GLib {
 					
 		}
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_register_type (string name, IntPtr parent_type);
 
 		protected static GType RegisterGType (System.Type t)
@@ -185,7 +185,7 @@ namespace GLib {
 			Raw = g_object_new (gtype.Val, IntPtr.Zero);
 		}
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_object_newv (IntPtr gtype, int n_params, string[] names, GLib.Value[] vals);
 
 		protected virtual void CreateNativeObject (string[] names, GLib.Value[] vals)
@@ -207,7 +207,7 @@ namespace GLib {
 			}
 		}	
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		private static extern IntPtr gtksharp_get_type_id (IntPtr obj);
 
 		public static GLib.GType GType {
@@ -216,7 +216,7 @@ namespace GLib {
 			}
 		}
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_get_type_name (IntPtr raw);
 
 		protected string TypeName {
@@ -305,7 +305,7 @@ namespace GLib {
 			g_object_set_property (Raw, name, ref val);
 		}
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern void gtksharp_override_virtual_method (IntPtr gtype, string name, Delegate cb);
 
 		protected static void OverrideVirtualMethod (GType gtype, string name, Delegate cb)
@@ -316,7 +316,7 @@ namespace GLib {
 		[DllImport("libgobject-2.0-0.dll")]
 		protected static extern void g_signal_chain_from_overridden (IntPtr args, ref GLib.Value retval);
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern bool gtksharp_is_object (IntPtr obj);
 
 		internal static bool IsObject (IntPtr obj)
@@ -324,7 +324,7 @@ namespace GLib {
 			return gtksharp_is_object (obj);
 		}
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern int gtksharp_object_get_ref_count (IntPtr obj);
 
 		protected int RefCount {
diff --git a/glib/ObjectManager.cs b/glib/ObjectManager.cs
index 08edfac3e..f93aa9792 100644
--- a/glib/ObjectManager.cs
+++ b/glib/ObjectManager.cs
@@ -32,7 +32,7 @@ namespace GLib {
 
 		private static Hashtable types = new Hashtable ();
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_get_type_name (IntPtr raw);
 
 		public static GLib.Object CreateObject (IntPtr raw)
@@ -107,13 +107,13 @@ namespace GLib {
 			return expected_string;
 		}
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern int gtksharp_get_type_id (IntPtr raw);
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern int gtksharp_get_parent_type (int typ);
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_get_type_name_for_id (int typ);
 
 		static Type LookupType (string mangled)
diff --git a/glib/SList.cs b/glib/SList.cs
index 028312df9..49e87bb30 100644
--- a/glib/SList.cs
+++ b/glib/SList.cs
@@ -34,7 +34,7 @@ namespace GLib {
 			return new SList (g_slist_copy (Handle));
 		}
 		
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_slist_get_data (IntPtr l);
 		
 		internal override IntPtr GetData (IntPtr current)
@@ -42,7 +42,7 @@ namespace GLib {
 			return gtksharp_slist_get_data (current);
 		}
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_slist_get_next (IntPtr l);
 		
 		internal override IntPtr Next (IntPtr current)
diff --git a/glib/Value.cs b/glib/Value.cs
index 409e96225..1dfba822b 100755
--- a/glib/Value.cs
+++ b/glib/Value.cs
@@ -41,13 +41,13 @@ namespace GLib {
 		[DllImport("libgobject-2.0-0.dll")]
 		static extern void g_value_unset (ref GLib.Value val);
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_value_create_from_property(ref GLib.Value val, IntPtr obj, string name);
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_value_create_from_type_and_property(ref GLib.Value val, IntPtr gtype, string name);
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_value_create_from_type_name(ref GLib.Value val, string type_name);
 
 		public void Dispose () 
@@ -334,7 +334,7 @@ namespace GLib {
 		static extern int g_value_get_enum (ref Value val);
 		[DllImport("libgobject-2.0-0.dll")]
 		static extern uint g_value_get_flags (ref Value val);
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern bool glibsharp_value_holds_flags (ref Value val);
 
 		public static explicit operator EnumWrapper (Value val)
@@ -345,7 +345,7 @@ namespace GLib {
 				return new EnumWrapper (g_value_get_enum (ref val), false);
 		}
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_value_get_value_type (ref Value val);
 
 		[DllImport("libgobject-2.0-0.dll")]
diff --git a/glib/ValueArray.cs b/glib/ValueArray.cs
index 78a6df9f5..1d4f79057 100644
--- a/glib/ValueArray.cs
+++ b/glib/ValueArray.cs
@@ -72,7 +72,7 @@ namespace GLib {
 			}
 		}
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_value_array_get_array (IntPtr raw);
 
 		public IntPtr ArrayPtr {
@@ -113,7 +113,7 @@ namespace GLib {
 			g_value_array_remove (Handle, idx);
 		}
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern int gtksharp_value_array_get_count (IntPtr raw);
 
 		// ICollection
diff --git a/glib/glue/Makefile.am b/glib/glue/Makefile.am
index f5d42dfe4..c5faa92d1 100644
--- a/glib/glue/Makefile.am
+++ b/glib/glue/Makefile.am
@@ -1,8 +1,8 @@
-lib_LTLIBRARIES = libglibsharpglue-2.0.la
+lib_LTLIBRARIES = libglibsharpglue-2.la
 
-libglibsharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined
+libglibsharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
 
-libglibsharpglue_2_0_la_SOURCES = 	\
+libglibsharpglue_2_la_SOURCES = 	\
 	error.c			\
 	list.c			\
 	object.c		\
@@ -15,12 +15,12 @@ libglibsharpglue_2_0_la_SOURCES = 	\
 # Adding a new glue file?
 # Please remember to update makefile.win32
 
-libglibsharpglue_2_0_la_LIBADD = $(GLIB_LIBS)
+libglibsharpglue_2_la_LIBADD = $(GLIB_LIBS)
 
 INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
 
-libgtksharpglue.dll: $(libgtksharpglue_2_0_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def
-	./build-dll libgtksharpglue-2.0 $(VERSION)
+libgtksharpglue.dll: $(libgtksharpglue_2_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def
+	./build-dll libgtksharpglue-2 $(VERSION)
 
 CLEANFILES = lib*.a lib*.dll
 
diff --git a/glib/glue/makefile.win32 b/glib/glue/makefile.win32
index 58f74d099..4b396b012 100755
--- a/glib/glue/makefile.win32
+++ b/glib/glue/makefile.win32
@@ -1,5 +1,5 @@
-GTK_CFLAGS=`pkg-config --cflags gtk+-win32-2.0 libglade-2.0`
-GTK_LIBS=`pkg-config --libs gtk+-win32-2.0 libglade-2.0`
+GTK_CFLAGS=`pkg-config --cflags gobject-2.0`
+GTK_LIBS=`pkg-config --libs gobject-2.0`
 CC=gcc -mno-cygwin -mms-bitfields
 DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-symbols
 
@@ -14,16 +14,16 @@ GLUE_OBJS = \
         valuearray.o            \
 	win32dll.o
 
-all: glibsharpglue-2.0.dll
+all: glibsharpglue-2.dll
 
 
 %.o: %.c
 	$(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ 
 
 
-glibsharpglue-2.0.dll: $(GLUE_OBJS)
-	$(DLLWRAP) --output-lib=libglibsharpglue-2.0.a --dllname=glibsharpglue-2.0.dll --driver-name=gcc --output-def=glibsharpglue-2.0.def $(GLUE_OBJS) $(GTK_LIBS)
+glibsharpglue-2.dll: $(GLUE_OBJS)
+	$(DLLWRAP) --output-lib=libglibsharpglue-2.a --dllname=glibsharpglue-2.dll --driver-name=gcc --output-def=glibsharpglue-2.def $(GLUE_OBJS) $(GTK_LIBS)
 
 
 clean:
-	rm -f glibsharpglue-2.0.dll *.o libglibsharpglue-2.0.a
+	rm -f glibsharpglue-2.dll *.o libglibsharpglue-2.a
diff --git a/gnome/Canvas.custom b/gnome/Canvas.custom
index 6b7c81ee1..6df4175e3 100644
--- a/gnome/Canvas.custom
+++ b/gnome/Canvas.custom
@@ -33,7 +33,7 @@
 			gnome_canvas_w2c_affine(Handle, affine);
 		}
 
-		[DllImport("gnomesharpglue-2.0")]
+		[DllImport("gnomesharpglue-2")]
 		static extern double gnomesharp_canvas_get_pixels_per_unit (IntPtr raw);
 
 		[DllImport("gnomecanvas-2")]
diff --git a/gnome/CanvasItem.custom b/gnome/CanvasItem.custom
index 47241d3a1..614769106 100644
--- a/gnome/CanvasItem.custom
+++ b/gnome/CanvasItem.custom
@@ -34,7 +34,7 @@
                 	g_object_ref (Handle);
                 }
                 
-                [DllImport("gnomesharpglue-2.0")]
+                [DllImport("gnomesharpglue-2")]
                 static extern IntPtr gtksharp_gnome_canvas_item_get_canvas (IntPtr i);
                 public Canvas Canvas {
                 	get { return GLib.Object.GetObject (gtksharp_gnome_canvas_item_get_canvas (this.Handle), false) as Canvas; }
@@ -56,10 +56,10 @@
 			gnome_canvas_item_i2w_affine(Handle, affine);
 		}
 
-		[DllImport("gnomesharpglue-2.0")]
+		[DllImport("gnomesharpglue-2")]
 		static extern void gnomesharp_canvas_item_base_realize (IntPtr handle);
 
-		[DllImport("gnomesharpglue-2.0")]
+		[DllImport("gnomesharpglue-2")]
 		static extern void gnomesharp_canvas_item_override_realize (GLib.GType gtype, RealizeDelegate cb);
 
 		delegate void RealizeDelegate (IntPtr item);
@@ -85,10 +85,10 @@
 			gnomesharp_canvas_item_base_realize (Handle);
 		}
 
-		[DllImport("gnomesharpglue-2.0")]
+		[DllImport("gnomesharpglue-2")]
 		static extern double gnomesharp_canvas_item_base_point (IntPtr handle, double x, double y, int cx, int cy, out IntPtr actual_item_handle);
 
-		[DllImport("gnomesharpglue-2.0")]
+		[DllImport("gnomesharpglue-2")]
 		static extern void gnomesharp_canvas_item_override_point (GLib.GType gtype, PointDelegate cb);
 
 		delegate double PointDelegate (IntPtr item, double x, double y, int cx, int cy, out IntPtr actual_item_handle);
@@ -120,10 +120,10 @@
 			return result;
 		}
 
-		[DllImport("gnomesharpglue-2.0")]
+		[DllImport("gnomesharpglue-2")]
 		static extern void gnomesharp_canvas_item_base_draw (IntPtr handle, IntPtr drawable, int x, int y, int width, int height);
 
-		[DllImport("gnomesharpglue-2.0")]
+		[DllImport("gnomesharpglue-2")]
 		static extern void gnomesharp_canvas_item_override_draw (GLib.GType gtype, DrawDelegate cb);
 
 		delegate void DrawDelegate (IntPtr handle, IntPtr drawable, int x, int y, int width, int height);
@@ -150,10 +150,10 @@
 			gnomesharp_canvas_item_base_draw (Handle, drawable.Handle, x, y, width, height);
 		}
 
-		[DllImport("gnomesharpglue-2.0")]
+		[DllImport("gnomesharpglue-2")]
 		static extern void gnomesharp_canvas_item_base_render (IntPtr handle, ref CanvasBuf buf);
 
-		[DllImport("gnomesharpglue-2.0")]
+		[DllImport("gnomesharpglue-2")]
 		static extern void gnomesharp_canvas_item_override_render (GLib.GType gtype, RenderDelegate cb);
 
 		delegate void RenderDelegate (IntPtr handle, ref CanvasBuf buf);
@@ -179,10 +179,10 @@
 			gnomesharp_canvas_item_base_render (Handle, ref buf);
 		}
 
-		[DllImport("gnomesharpglue-2.0")]
+		[DllImport("gnomesharpglue-2")]
 		static extern void gnomesharp_canvas_item_base_update (IntPtr handle, double[] affine, ref Art.SVP clip_path, int flags);
 
-		[DllImport("gnomesharpglue-2.0")]
+		[DllImport("gnomesharpglue-2")]
 		static extern void gnomesharp_canvas_item_override_update (GLib.GType gtype, UpdateDelegate cb);
 
 		delegate void UpdateDelegate (IntPtr item, IntPtr affine_ptr, IntPtr clip_path, int flags);
diff --git a/gnome/CanvasPoints.custom b/gnome/CanvasPoints.custom
index f0268440a..ccb3c43d0 100644
--- a/gnome/CanvasPoints.custom
+++ b/gnome/CanvasPoints.custom
@@ -23,7 +23,7 @@
 // Boston, MA 02111-1307, USA.
 	
 	
-[DllImport("gnomesharpglue-2.0")]
+[DllImport("gnomesharpglue-2")]
 static extern System.IntPtr
 gtksharp_gnome_canvas_points_new_from_array (uint num_points, double[] coords);
 
diff --git a/gnome/Program.custom b/gnome/Program.custom
index 1b791844c..853f378ec 100644
--- a/gnome/Program.custom
+++ b/gnome/Program.custom
@@ -32,7 +32,7 @@ struct PropertyArg {
 	public GLib.Value value;
 }
 
-[DllImport("gnomesharpglue-2.0")]
+[DllImport("gnomesharpglue-2")]
 static extern System.IntPtr
 gtksharp_gnome_program_init (string app_id, string app_version, ref ModuleInfo module, int argc, string[] argv, int nargs, PropertyArg[] args);
 
diff --git a/gnome/glue/Makefile.am b/gnome/glue/Makefile.am
index 30a66c254..23546bc1d 100644
--- a/gnome/glue/Makefile.am
+++ b/gnome/glue/Makefile.am
@@ -1,14 +1,14 @@
 lib_LTLIBRARIES = $(TARGET)
 
 if ENABLE_GNOME
-TARGET = libgnomesharpglue-2.0.la
+TARGET = libgnomesharpglue-2.la
 else
 TARGET = 
 endif
 
-libgnomesharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined
+libgnomesharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
 
-libgnomesharpglue_2_0_la_SOURCES = 	\
+libgnomesharpglue_2_la_SOURCES = 	\
 	canvas.c 		\
 	canvasitem.c 		\
 	canvaspoints.c 		\
@@ -19,12 +19,12 @@ libgnomesharpglue_2_0_la_SOURCES = 	\
 	program.c		\
 	#
 
-libgnomesharpglue_2_0_la_LIBADD = $(GNOME_LIBS)
+libgnomesharpglue_2_la_LIBADD = $(GNOME_LIBS)
 
 INCLUDES = $(GNOME_CFLAGS) -I$(top_srcdir)
 
-libgnomesharpglue.dll: $(libgnomesharpglue_2_0_la_OBJECTS) libgnomesharpglue.rc libgnomesharpglue.def
-	./build-dll libgnomesharpglue-2.0 $(VERSION)
+libgnomesharpglue.dll: $(libgnomesharpglue_2_la_OBJECTS) libgnomesharpglue.rc libgnomesharpglue.def
+	./build-dll libgnomesharpglue-2 $(VERSION)
 
 CLEANFILES = lib*.a lib*.dll
 
diff --git a/gtk/Adjustment.custom b/gtk/Adjustment.custom
index fa11e702d..615ae2566 100644
--- a/gtk/Adjustment.custom
+++ b/gtk/Adjustment.custom
@@ -37,7 +37,7 @@ public Adjustment (double value, double lower, double upper, double step_increme
 	Raw = gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern void gtksharp_gtk_adjustment_set_bounds (IntPtr i, double lower, double upper, double step_increment, double page_increment, double page_size);
 
 public void SetBounds (double lower, double upper, double step_increment, double page_increment, double page_size)
diff --git a/gtk/Button.custom b/gtk/Button.custom
index 10eaf55b3..2b0a384f8 100644
--- a/gtk/Button.custom
+++ b/gtk/Button.custom
@@ -39,9 +39,9 @@ public Button (string stock_id) : base (IntPtr.Zero)
 	Raw = gtk_button_new_from_stock(stock_id);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern int gtksharp_button_get_in_button (IntPtr button);
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern void gtksharp_button_set_in_button (IntPtr button, int b);
 
 public bool InButton {
diff --git a/gtk/CellRenderer.custom b/gtk/CellRenderer.custom
index 7744a6c75..66e734901 100644
--- a/gtk/CellRenderer.custom
+++ b/gtk/CellRenderer.custom
@@ -23,10 +23,10 @@
 // Boston, MA 02111-1307, USA.
 
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern void gtksharp_cellrenderer_base_get_size (IntPtr handle, IntPtr widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height);
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern void gtksharp_cellrenderer_override_get_size (GLib.GType gtype, GetSizeDelegate cb);
 		
 		delegate void GetSizeDelegate (IntPtr item, IntPtr widget, IntPtr cell_area_ptr, IntPtr x_offset, IntPtr y_offset, IntPtr width, IntPtr height);
@@ -64,10 +64,10 @@
 		}
 
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern void gtksharp_cellrenderer_base_render (IntPtr handle, IntPtr window, IntPtr widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern void gtksharp_cellrenderer_override_render (GLib.GType gtype, RenderDelegate cb);
 
 		delegate void RenderDelegate (IntPtr item, IntPtr window, IntPtr widget, ref Gdk.Rectangle background_area, ref Gdk.Rectangle cell_area, ref Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
@@ -95,7 +95,7 @@
 			gtksharp_cellrenderer_base_render (Handle, window.Handle, widget.Handle, background_area, cell_area, expose_area, flags);
 		}
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern void gtksharp_cellrenderer_override_start_editing (GLib.GType gtype, StartEditingDelegate cb);
 
 		delegate IntPtr StartEditingDelegate (IntPtr raw, IntPtr evnt, IntPtr widget, string path, ref Gdk.Rectangle background_area, ref Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
@@ -120,7 +120,7 @@
 			gtksharp_cellrenderer_override_start_editing (gtype, StartEditingCallback);
 		}
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern IntPtr gtksharp_cellrenderer_base_start_editing(IntPtr raw, IntPtr evnt, IntPtr widget, string path, ref Gdk.Rectangle background_area, ref Gdk.Rectangle cell_area, int flags);
 
 		[GLib.DefaultSignalHandler (Type=typeof(Gtk.CellRenderer), ConnectionMethod="OverrideStartEditing")]
diff --git a/gtk/Clipboard.custom b/gtk/Clipboard.custom
index 89e000dd3..88999a639 100644
--- a/gtk/Clipboard.custom
+++ b/gtk/Clipboard.custom
@@ -21,16 +21,16 @@
 		[DllImport("libgtk-win32-2.0-0.dll")]
 		static extern bool gtk_clipboard_set_with_data(IntPtr raw, IntPtr targets, int n_targets, GtkSharp.GtkClipboardGetFuncNative get_func, GtkSharp.GtkClipboardClearFuncNative clear_func, uint id);
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern IntPtr gtksharp_clipboard_target_list_add (IntPtr list, string name, uint flags, uint info);
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern IntPtr gtksharp_clipboard_target_list_to_array (IntPtr list);
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern void gtksharp_clipboard_target_array_free (IntPtr targets);
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern void gtksharp_clipboard_target_list_free (IntPtr list);
 
 		GtkSharp.GtkClipboardGetFuncWrapper get_func_wrapper;
diff --git a/gtk/ColorSelectionDialog.custom b/gtk/ColorSelectionDialog.custom
index 2af5de5c3..4e3a80ca2 100644
--- a/gtk/ColorSelectionDialog.custom
+++ b/gtk/ColorSelectionDialog.custom
@@ -35,25 +35,25 @@ public class ColorSelectionButton : Gtk.Button {
 	}
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_color_selection_dialog_get_colorsel (IntPtr i);
 public Gtk.ColorSelection ColorSelection {
        get { return new ColorSelection (gtksharp_color_selection_dialog_get_colorsel (this.Handle)); }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_color_selection_dialog_get_ok_button (IntPtr i);
 public Gtk.Button OkButton {
        get { return new ColorSelectionButton (this, gtksharp_color_selection_dialog_get_ok_button (this.Handle)); }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_color_selection_dialog_get_cancel_button (IntPtr i);
 public Gtk.Button CancelButton {
        get { return new ColorSelectionButton (this, gtksharp_color_selection_dialog_get_cancel_button (this.Handle)); }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_color_selection_dialog_get_help_button (IntPtr i);
 public Gtk.Button HelpButton {
        get { return new ColorSelectionButton (this, gtksharp_color_selection_dialog_get_help_button (this.Handle)); }
diff --git a/gtk/Combo.custom b/gtk/Combo.custom
index dc7529666..7597a3b20 100644
--- a/gtk/Combo.custom
+++ b/gtk/Combo.custom
@@ -26,7 +26,7 @@ public string[] PopdownStrings {
 	}
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_combo_get_entry(IntPtr i);
 
 public Gtk.Entry Entry {
@@ -35,7 +35,7 @@ public Gtk.Entry Entry {
 	}
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_combo_get_button(IntPtr i);
 
 public Gtk.Button Button {
diff --git a/gtk/Container.custom b/gtk/Container.custom
index bd3e6c6c0..c2831e3c9 100644
--- a/gtk/Container.custom
+++ b/gtk/Container.custom
@@ -19,7 +19,7 @@
 // Boston, MA 02111-1307, USA.
 
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern void gtksharp_container_child_get_property (IntPtr container, IntPtr child, string property, ref GLib.Value value);
 
 public GLib.Value ChildGetProperty (Gtk.Widget child, string property_name) {
@@ -74,7 +74,7 @@ public Widget[] FocusChain {
 		
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_container_get_focus_child(IntPtr raw);
 
 [DllImport("libgtk-win32-2.0-0.dll")]
@@ -95,13 +95,13 @@ public Gtk.Widget FocusChild {
 	}
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern void gtksharp_container_base_forall (IntPtr handle, bool include_internals, IntPtr cb, IntPtr data);
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern void gtksharp_container_override_forall (GLib.GType gtype, ForallDelegate cb);
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern void gtksharp_container_invoke_gtk_callback (IntPtr cb, IntPtr handle, IntPtr data);
 
 delegate void ForallDelegate (IntPtr container, bool include_internals, IntPtr cb, IntPtr data);
@@ -156,10 +156,10 @@ protected virtual void ForAll (bool include_internals, CallbackInvoker invoker)
 	gtksharp_container_base_forall (Handle, include_internals, invoker.Callback, invoker.Data);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_container_base_child_type(IntPtr raw);
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern void gtksharp_container_override_child_type (GLib.GType type, ChildTypeDelegate cb);
 
 delegate IntPtr ChildTypeDelegate (IntPtr raw);
diff --git a/gtk/Dialog.custom b/gtk/Dialog.custom
index 89f8a2fc3..597e828ae 100644
--- a/gtk/Dialog.custom
+++ b/gtk/Dialog.custom
@@ -48,13 +48,13 @@ public Dialog (string title, Gtk.Window parent, Gtk.DialogFlags flags) : base(In
 	Raw = gtk_dialog_new_with_buttons (title, parent.Handle, (int) flags, IntPtr.Zero);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_dialog_get_vbox (IntPtr i);
 public Gtk.VBox VBox {
 	get { return GLib.Object.GetObject (gtksharp_dialog_get_vbox (this.Handle), false) as VBox; }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_dialog_get_action_area (IntPtr i);
 public Gtk.HButtonBox ActionArea {
 	get { return GLib.Object.GetObject (gtksharp_dialog_get_action_area (this.Handle), false) as HButtonBox; }
diff --git a/gtk/FileSelection.custom b/gtk/FileSelection.custom
index 1fd2b4e29..aa62c9f73 100644
--- a/gtk/FileSelection.custom
+++ b/gtk/FileSelection.custom
@@ -36,73 +36,73 @@ public class FSButton : Gtk.Button {
 	}
 }
 	
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_file_selection_get_dir_list (IntPtr i);
 public Gtk.TreeView DirList {
 	get { return GLib.Object.GetObject (gtksharp_file_selection_get_dir_list (this.Handle), false) as Gtk.TreeView; }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_file_selection_get_file_list (IntPtr i);
 public Gtk.TreeView FileList {
 	get { return GLib.Object.GetObject (gtksharp_file_selection_get_file_list (this.Handle), false) as Gtk.TreeView; }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_file_selection_get_selection_entry (IntPtr i);
 public Gtk.Entry SelectionEntry {
 	get { return GLib.Object.GetObject (gtksharp_file_selection_get_selection_entry (this.Handle), false) as Gtk.Entry; }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_file_selection_get_selection_text (IntPtr i);
 public Gtk.Label SelectionText {
 	get { return GLib.Object.GetObject (gtksharp_file_selection_get_selection_text (this.Handle), false) as Gtk.Label; }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_file_selection_get_ok_button (IntPtr i);
 public Gtk.Button OkButton {
 	get { return new FSButton (this, gtksharp_file_selection_get_ok_button (this.Handle)); }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_file_selection_get_cancel_button (IntPtr i);
 public Gtk.Button CancelButton {
 	get { return new FSButton (this, gtksharp_file_selection_get_cancel_button (this.Handle)); }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_file_selection_get_help_button (IntPtr i);
 public Gtk.Button HelpButton {
 	get { return new FSButton (this, gtksharp_file_selection_get_help_button (this.Handle)); }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_file_selection_get_history_pulldown (IntPtr i);
 public Gtk.OptionMenu HistoryPulldown {
 	get { return GLib.Object.GetObject (gtksharp_file_selection_get_history_pulldown (this.Handle), false) as Gtk.OptionMenu; }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_file_selection_get_history_menu (IntPtr i);
 public Gtk.Menu HistoryMenu {
 	get { return GLib.Object.GetObject (gtksharp_file_selection_get_history_menu (this.Handle), false) as Gtk.Menu; }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_file_selection_get_fileop_dialog (IntPtr i);
 public Gtk.MessageDialog FileopDialog {
 	get { return GLib.Object.GetObject (gtksharp_file_selection_get_fileop_dialog (this.Handle), false) as Gtk.MessageDialog; }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_file_selection_get_fileop_entry (IntPtr i);
 public Gtk.Entry FileopEntry {
 	get { return GLib.Object.GetObject (gtksharp_file_selection_get_fileop_entry (this.Handle), false) as Gtk.Entry; }
 }
 
-[DllImport("gtksharpglue-2.0", CallingConvention=CallingConvention.Cdecl)]
+[DllImport("gtksharpglue-2", CallingConvention=CallingConvention.Cdecl)]
 static extern IntPtr gtksharp_file_selection_get_fileop_file (IntPtr i);
 public string FileopFile {
 	get {
@@ -110,31 +110,31 @@ public string FileopFile {
 	}
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_file_selection_get_fileop_c_dir (IntPtr i);
 public Gtk.Button FileopCDir {
 	get { return new FSButton (this, gtksharp_file_selection_get_fileop_c_dir(this.Handle)); }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_file_selection_get_fileop_del_file (IntPtr i);
 public Gtk.Button FileopDelFile {
 	get { return new FSButton (this, gtksharp_file_selection_get_fileop_del_file (this.Handle)); }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_file_selection_get_fileop_ren_file (IntPtr i);
 public Gtk.Button FileopRenFile {
 	get { return new FSButton (this, gtksharp_file_selection_get_fileop_ren_file (this.Handle)); }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_file_selection_get_button_area (IntPtr i);
 public Gtk.HButtonBox ButtonArea {
 	get { return GLib.Object.GetObject (gtksharp_file_selection_get_button_area (this.Handle), false) as Gtk.HButtonBox; }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_file_selection_get_action_area (IntPtr i);
 public new Gtk.HButtonBox ActionArea {
 	get { return GLib.Object.GetObject (gtksharp_file_selection_get_action_area (this.Handle), false) as Gtk.HButtonBox; }
diff --git a/gtk/InputDialog.custom b/gtk/InputDialog.custom
index dc84cf32f..44db6e9c5 100644
--- a/gtk/InputDialog.custom
+++ b/gtk/InputDialog.custom
@@ -21,7 +21,7 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern IntPtr gtksharp_input_dialog_get_save_button (IntPtr i);
 
 		public Gtk.Button SaveButton {
@@ -31,7 +31,7 @@
 			}
 		}
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern IntPtr gtksharp_input_dialog_get_close_button (IntPtr i);
 
 		public Gtk.Button CloseButton {
diff --git a/gtk/Layout.custom b/gtk/Layout.custom
index f0b02e74b..2253f0fb7 100644
--- a/gtk/Layout.custom
+++ b/gtk/Layout.custom
@@ -24,7 +24,7 @@
 // Boston, MA 02111-1307, USA.
 
 		
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_layout_get_bin_window (IntPtr layout);
 
 public Gdk.Window BinWindow {
diff --git a/gtk/NodeStore.cs b/gtk/NodeStore.cs
index 62d01e31e..c52f2b750 100644
--- a/gtk/NodeStore.cs
+++ b/gtk/NodeStore.cs
@@ -260,7 +260,7 @@ namespace Gtk {
 			return true;
 		}
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern void gtksharp_node_store_set_tree_model_callbacks (IntPtr raw, ref TreeModelIfaceDelegates cbs);
 
 		private void BuildTreeModelIface ()
@@ -281,7 +281,7 @@ namespace Gtk {
 			gtksharp_node_store_set_tree_model_callbacks (Handle, ref tree_model_iface);
 		}
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern IntPtr gtksharp_node_store_new ();
 
 		public NodeStore (Type node_type) : base (IntPtr.Zero)
@@ -339,7 +339,7 @@ namespace Gtk {
 			}
 		}							
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern void gtksharp_node_store_emit_row_changed (IntPtr handle, IntPtr path, int node_idx);
 
 		private void changed_cb (object o, EventArgs args)
@@ -350,7 +350,7 @@ namespace Gtk {
 			gtksharp_node_store_emit_row_changed (Handle, get_path_cb (node.ID), node.ID);
 		}
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern void gtksharp_node_store_emit_row_inserted (IntPtr handle, IntPtr path, int node_idx);
 
 		private void child_added_cb (object o, ITreeNode child)
@@ -360,10 +360,10 @@ namespace Gtk {
 			gtksharp_node_store_emit_row_inserted (Handle, get_path_cb (child.ID), child.ID);
 		}
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern void gtksharp_node_store_emit_row_deleted (IntPtr handle, IntPtr path);
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern void gtksharp_node_store_emit_row_has_child_toggled (IntPtr handle, IntPtr path, int node_idx);
 
 		private void child_deleted_cb (object o, int idx)
@@ -439,7 +439,7 @@ namespace Gtk {
 			return GetNodeAtPath (path);
 		}
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		static extern IntPtr gtksharp_node_store_get_type ();
 		
 		public static new GLib.GType GType {
diff --git a/gtk/Object.custom b/gtk/Object.custom
index 9a3640d84..7b1b32c96 100755
--- a/gtk/Object.custom
+++ b/gtk/Object.custom
@@ -21,10 +21,10 @@
 // Boston, MA 02111-1307, USA.
 
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		private static extern bool gtksharp_object_is_floating (IntPtr raw);
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		private static extern bool gtksharp_object_set_floating (IntPtr raw, bool val);
 
 		[DllImport("libgobject-2.0-0.dll")]
diff --git a/gtk/SelectionData.custom b/gtk/SelectionData.custom
index f78f92aa0..5776ba3fb 100644
--- a/gtk/SelectionData.custom
+++ b/gtk/SelectionData.custom
@@ -18,7 +18,7 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		private static extern int gtksharp_gtk_selection_data_get_format (IntPtr selection_data);
 
 		public int Format {
@@ -27,7 +27,7 @@
 			}
 		}
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		private static extern int gtksharp_gtk_selection_data_get_length (IntPtr selection_data);
 
 		public int Length {
@@ -54,7 +54,7 @@
 			}
 		}
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		private static extern IntPtr gtksharp_gtk_selection_data_get_data_pointer (IntPtr selection_data);
 
 		public byte[] Data {
@@ -70,7 +70,7 @@
 			Set(type, format, data, data.Length);
 		}
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		private static extern IntPtr gtksharp_gtk_selection_data_get_selection (IntPtr selection_data);
 
 		public Gdk.Atom Selection {
@@ -79,7 +79,7 @@
 			}
 		}
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		private static extern IntPtr gtksharp_gtk_selection_data_get_target (IntPtr selection_data);
 
 		public Gdk.Atom Target {
@@ -111,7 +111,7 @@
 			}
 		}
 
-		[DllImport("gtksharpglue-2.0")]
+		[DllImport("gtksharpglue-2")]
 		private static extern IntPtr gtksharp_gtk_selection_data_get_type (IntPtr selection_data);
 
 		public Gdk.Atom Type {
diff --git a/gtk/Style.custom b/gtk/Style.custom
index 938530f49..50b2d8cc9 100644
--- a/gtk/Style.custom
+++ b/gtk/Style.custom
@@ -33,21 +33,21 @@ static Gdk.GC EnsureGC (IntPtr raw) {
 	return ret;
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_get_white_gc (IntPtr style);
 
 public Gdk.GC WhiteGC {
 	get { return EnsureGC (gtksharp_gtk_style_get_white_gc (Handle)); }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_get_black_gc (IntPtr style);
 
 public Gdk.GC BlackGC {
 	get { return EnsureGC (gtksharp_gtk_style_get_black_gc (Handle)); }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_get_fg_gc (IntPtr style, int i);
 
 public Gdk.GC ForegroundGC (StateType state)
@@ -56,7 +56,7 @@ public Gdk.GC ForegroundGC (StateType state)
 	return EnsureGC (raw);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_set_fg_gc (IntPtr style, int i, IntPtr gc);
 
 public void SetForegroundGC (StateType state, Gdk.GC gc)
@@ -75,7 +75,7 @@ public Gdk.GC[] ForegroundGCs {
 	}
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_get_bg_gc (IntPtr style, int i);
 
 public Gdk.GC BackgroundGC (StateType state)
@@ -84,7 +84,7 @@ public Gdk.GC BackgroundGC (StateType state)
 		return EnsureGC (raw);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_set_bg_gc (IntPtr style, int i, IntPtr gc);
 
 public void SetBackgroundGC (StateType state, Gdk.GC gc)
@@ -103,7 +103,7 @@ public Gdk.GC[] BackgroundGCs {
 	}
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_get_base_gc (IntPtr style, int i);
 
 public Gdk.GC BaseGC (StateType state)
@@ -112,7 +112,7 @@ public Gdk.GC BaseGC (StateType state)
 	return EnsureGC (raw);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_set_base_gc (IntPtr style, int i, IntPtr gc);
 
 public void SetBaseGC (StateType state, Gdk.GC gc)
@@ -120,7 +120,7 @@ public void SetBaseGC (StateType state, Gdk.GC gc)
 		gtksharp_gtk_style_set_base_gc (Handle, (int) state, gc.Handle);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_get_text_gc (IntPtr style, int i);
 
 public Gdk.GC TextGC (StateType state)
@@ -129,7 +129,7 @@ public Gdk.GC TextGC (StateType state)
 	return EnsureGC (raw);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_set_text_gc (IntPtr style, int i, IntPtr gc);
 
 public void SetTextGC (StateType state, Gdk.GC gc)
@@ -137,7 +137,7 @@ public void SetTextGC (StateType state, Gdk.GC gc)
 		gtksharp_gtk_style_set_text_gc (Handle, (int) state, gc.Handle);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_get_text_aa_gc (IntPtr style, int i);
 
 public Gdk.GC TextAAGC (StateType state)
@@ -146,7 +146,7 @@ public Gdk.GC TextAAGC (StateType state)
 	return EnsureGC (raw);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_set_text_aa_gc (IntPtr style, int i, IntPtr gc);
 
 public void SetTextAAGC (StateType state, Gdk.GC gc)
@@ -154,7 +154,7 @@ public void SetTextAAGC (StateType state, Gdk.GC gc)
 		gtksharp_gtk_style_set_text_aa_gc (Handle, (int) state, gc.Handle);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_get_light_gc (IntPtr style, int i);
 
 public Gdk.GC LightGC (StateType state)
@@ -163,7 +163,7 @@ public Gdk.GC LightGC (StateType state)
 	return EnsureGC (raw);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_set_light_gc (IntPtr style, int i, IntPtr gc);
 
 public void SetLightGC (StateType state, Gdk.GC gc)
@@ -171,7 +171,7 @@ public void SetLightGC (StateType state, Gdk.GC gc)
 		gtksharp_gtk_style_set_light_gc (Handle, (int) state, gc.Handle);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_get_dark_gc (IntPtr style, int i);
 
 public Gdk.GC DarkGC (StateType state)
@@ -180,7 +180,7 @@ public Gdk.GC DarkGC (StateType state)
 	return EnsureGC (raw);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_set_dark_gc (IntPtr style, int i, IntPtr gc);
 
 public void SetDarkGC (StateType state, Gdk.GC gc)
@@ -188,7 +188,7 @@ public void SetDarkGC (StateType state, Gdk.GC gc)
 		gtksharp_gtk_style_set_dark_gc (Handle, (int) state, gc.Handle);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_get_mid_gc (IntPtr style, int i);
 
 public Gdk.GC MidGC (StateType state)
@@ -197,7 +197,7 @@ public Gdk.GC MidGC (StateType state)
 	return EnsureGC (raw);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_set_mid_gc (IntPtr style, int i, IntPtr gc);
 
 public void SetMidGC (StateType state, Gdk.GC gc)
@@ -205,21 +205,21 @@ public void SetMidGC (StateType state, Gdk.GC gc)
 		gtksharp_gtk_style_set_mid_gc (Handle, (int) state, gc.Handle);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_get_white (IntPtr style);
 
 public Gdk.Color White {
 	get { return Gdk.Color.New (gtksharp_gtk_style_get_white (Handle)); }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_get_black (IntPtr style);
 
 public Gdk.Color Black {
 	get { return Gdk.Color.New (gtksharp_gtk_style_get_black (Handle)); }
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_get_bg (IntPtr style, int i);
 
 public Gdk.Color Background (StateType state)
@@ -239,7 +239,7 @@ public Gdk.Color[] Backgrounds {
 	}
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_get_fg (IntPtr style, int i);
 
 public Gdk.Color Foreground (StateType state)
@@ -259,7 +259,7 @@ public Gdk.Color[] Foregrounds {
 	}
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_get_text (IntPtr style, int i);
 
 public Gdk.Color Text (StateType state)
@@ -279,7 +279,7 @@ public Gdk.Color[] TextColors {
 	}
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_get_base (IntPtr style, int i);
 
 public Gdk.Color Base (StateType state)
@@ -299,9 +299,9 @@ public Gdk.Color[] BaseColors {
 	}
 }
 
-[DllImport ("gtksharpglue-2.0")]
+[DllImport ("gtksharpglue-2")]
 static extern int gtksharp_gtk_style_get_thickness (IntPtr style, int x_axis);
-[DllImport ("gtksharpglue-2.0")]
+[DllImport ("gtksharpglue-2")]
 static extern void gtksharp_gtk_style_set_thickness (IntPtr style, int value);
 
 public int XThickness {
@@ -324,7 +324,7 @@ public int YThickness {
 	}
 }
 
-[DllImport ("gtksharpglue-2.0")]
+[DllImport ("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_style_get_font_description (IntPtr style);
 
 public Pango.FontDescription FontDescription {
diff --git a/gtk/TextIter.custom b/gtk/TextIter.custom
index ecd568f14..fbd2f9774 100755
--- a/gtk/TextIter.custom
+++ b/gtk/TextIter.custom
@@ -19,7 +19,7 @@
 // Boston, MA 02111-1307, USA.
 
 
-		[DllImport("glibsharpglue-2.0")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_unichar_to_utf8_string (int raw);
 
 		[DllImport("libgtk-win32-2.0-0.dll")]
diff --git a/gtk/Widget.custom b/gtk/Widget.custom
index c6f777a21..234b00334 100644
--- a/gtk/Widget.custom
+++ b/gtk/Widget.custom
@@ -44,10 +44,10 @@ private void Widget_ParentSet (object o, ParentSetArgs args)
 		ParentedWidgets.Remove (this);
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_widget_get_allocation (IntPtr style);
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern void gtksharp_gtk_widget_set_allocation (IntPtr raw, Gdk.Rectangle rect);
 
 public Gdk.Rectangle Allocation {
@@ -56,9 +56,9 @@ public Gdk.Rectangle Allocation {
 }
 
 
-[DllImport ("gtksharpglue-2.0")]
+[DllImport ("gtksharpglue-2")]
 static extern IntPtr gtksharp_gtk_widget_get_window (IntPtr widget);
-[DllImport ("gtksharpglue-2.0")]
+[DllImport ("gtksharpglue-2")]
 static extern void gtksharp_gtk_widget_set_window (IntPtr widget, IntPtr window);
 public Gdk.Window GdkWindow {
 	get {
@@ -85,7 +85,7 @@ public void AddAccelerator (string accel_signal, AccelGroup accel_group, AccelKe
 [DllImport("libgtk-win32-2.0-0.dll")]
 static extern void gtk_widget_set_state (IntPtr raw, int state);
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern int gtksharp_gtk_widget_get_state (IntPtr raw);
 
 public Gtk.StateType State {
@@ -97,10 +97,10 @@ public Gtk.StateType State {
 	}
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern int gtksharp_gtk_widget_get_flags (IntPtr raw);
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern void gtksharp_gtk_widget_set_flags (IntPtr raw, int flags);
 
 public int Flags {
@@ -177,7 +177,7 @@ public bool IsDrawable {
 	}
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern int gtksharp_gtk_widget_style_get_int (IntPtr raw, string name);
 
 public int FocusLineWidth {
@@ -186,7 +186,7 @@ public int FocusLineWidth {
 	}
 }
 
-[DllImport("gtksharpglue-2.0")]
+[DllImport("gtksharpglue-2")]
 static extern int gtksharp_widget_connect_set_scroll_adjustments_signal (IntPtr gtype, SetScrollAdjustmentsDelegate cb);
 
 delegate void SetScrollAdjustmentsDelegate (IntPtr widget, IntPtr hadj, IntPtr vadj);
diff --git a/gtk/glue/Makefile.am b/gtk/glue/Makefile.am
index 219dd3f7e..c9b79e068 100644
--- a/gtk/glue/Makefile.am
+++ b/gtk/glue/Makefile.am
@@ -1,6 +1,6 @@
-lib_LTLIBRARIES = libgtksharpglue-2.0.la
+lib_LTLIBRARIES = libgtksharpglue-2.la
 
-libgtksharpglue_2_0_la_SOURCES =	\
+libgtksharpglue_2_la_SOURCES =	\
 	adjustment.c		\
 	button.c		\
 	cellrenderer.c		\
@@ -23,14 +23,14 @@ libgtksharpglue_2_0_la_SOURCES =	\
 # Adding a new glue file?
 # Please remember to update makefile.win32
 
-libgtksharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined
+libgtksharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
 
-libgtksharpglue_2_0_la_LIBADD = $(GTK_LIBS)
+libgtksharpglue_2_la_LIBADD = $(GTK_LIBS)
 
 INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir)
 
-libgtksharpglue.dll: $(libgtksharpglue_2_0_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def
-	./build-dll libgtksharpglue-2.0 $(VERSION)
+libgtksharpglue.dll: $(libgtksharpglue_2_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def
+	./build-dll libgtksharpglue-2 $(VERSION)
 
 CLEANFILES = lib*.a lib*.dll
 
diff --git a/gtk/glue/makefile.win32 b/gtk/glue/makefile.win32
index 330170219..3edf7cdac 100755
--- a/gtk/glue/makefile.win32
+++ b/gtk/glue/makefile.win32
@@ -22,16 +22,16 @@ GLUE_OBJS = \
         widget.o                \
 	win32dll.o
 
-all: gtksharpglue-2.0.dll
+all: gtksharpglue-2.dll
 
 
 %.o: %.c
 	$(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ 
 
 
-gtksharpglue-2.0.dll: $(GLUE_OBJS)
-	$(DLLWRAP) --output-lib=libgtksharpglue-2.0.a --dllname=gtksharpglue-2.0.dll --driver-name=gcc --output-def=gtksharpglue-2.0.def $(GLUE_OBJS) $(GTK_LIBS)
+gtksharpglue-2.dll: $(GLUE_OBJS)
+	$(DLLWRAP) --output-lib=libgtksharpglue-2.a --dllname=gtksharpglue-2.dll --driver-name=gcc --output-def=gtksharpglue-2.def $(GLUE_OBJS) $(GTK_LIBS)
 
 
 clean:
-	rm -f gtksharpglue-2.0.dll *.o libgtksharpglue-2.0.a
+	rm -f gtksharpglue-2.dll *.o libgtksharpglue-2.a
diff --git a/panelapplet/glue/Makefile.am b/panelapplet/glue/Makefile.am
index e5f4645f8..e570b08ac 100644
--- a/panelapplet/glue/Makefile.am
+++ b/panelapplet/glue/Makefile.am
@@ -1,17 +1,17 @@
 lib_LTLIBRARIES = $(TARGET)
 
 if ENABLE_PANEL
-TARGET = libpanelappletsharpglue-2.0.la
+TARGET = libpanelappletsharpglue-2.la
 else
 TARGET = 
 endif
 
-libpanelappletsharpglue_2_0_la_SOURCES =	\
+libpanelappletsharpglue_2_la_SOURCES =	\
 	panelapplet.c
 
-libpanelappletsharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined
+libpanelappletsharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
 
-libpanelappletsharpglue_2_0_la_LIBADD = $(LIBPANEL_LIBS)
+libpanelappletsharpglue_2_la_LIBADD = $(LIBPANEL_LIBS)
 
 INCLUDES = $(LIBPANEL_CFLAGS) -I$(top_srcdir)
 
diff --git a/pango/LayoutLine.custom b/pango/LayoutLine.custom
index 0167014f3..f1d54ceda 100644
--- a/pango/LayoutLine.custom
+++ b/pango/LayoutLine.custom
@@ -21,7 +21,7 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
-[DllImport("pangosharpglue-2.0")]
+[DllImport("pangosharpglue-2")]
 static extern IntPtr pangosharp_pango_layout_line_get_layout (IntPtr line);
 
 public Layout Layout {
@@ -36,7 +36,7 @@ public Layout Layout {
 	}
 }
 
-[DllImport("pangosharpglue-2.0")]
+[DllImport("pangosharpglue-2")]
 static extern int pangosharp_pango_layout_line_get_start_index (IntPtr line);
 
 public int StartIndex {
@@ -45,7 +45,7 @@ public int StartIndex {
 	}
 }
 
-[DllImport("pangosharpglue-2.0")]
+[DllImport("pangosharpglue-2")]
 static extern int pangosharp_pango_layout_line_get_length (IntPtr line);
 
 public int Length {
diff --git a/pango/glue/Makefile.am b/pango/glue/Makefile.am
index c096523c4..2b976d568 100644
--- a/pango/glue/Makefile.am
+++ b/pango/glue/Makefile.am
@@ -1,19 +1,19 @@
-lib_LTLIBRARIES = libpangosharpglue-2.0.la
+lib_LTLIBRARIES = libpangosharpglue-2.la
 
-libpangosharpglue_2_0_la_SOURCES =	\
+libpangosharpglue_2_la_SOURCES =	\
 	layoutline.c
 
 # Adding a new glue file?
 # Please remember to update makefile.win32
 
-libpangosharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined
+libpangosharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
 
-libpangosharpglue_2_0_la_LIBADD = $(PANGO_LIBS)
+libpangosharpglue_2_la_LIBADD = $(PANGO_LIBS)
 
 INCLUDES = $(PANGO_CFLAGS) -I$(top_srcdir)
 
-libpangosharpglue.dll: $(libpangosharpglue_2_0_la_OBJECTS) libpangosharpglue.rc libpangosharpglue.def
-	./build-dll libpangosharpglue-2.0 $(VERSION)
+libpangosharpglue.dll: $(libpangosharpglue_2_la_OBJECTS) libpangosharpglue.rc libpangosharpglue.def
+	./build-dll libpangosharpglue-2 $(VERSION)
 
 CLEANFILES = lib*.a lib*.dll
 
diff --git a/pango/glue/makefile.win32 b/pango/glue/makefile.win32
index 559d8a1ac..2614d047e 100644
--- a/pango/glue/makefile.win32
+++ b/pango/glue/makefile.win32
@@ -7,16 +7,16 @@ GLUE_OBJS = \
         layoutline.o	\
 	win32dll.o
 
-all: pangosharpglue-2.0.dll
+all: pangosharpglue-2.dll
 
 
 %.o: %.c
 	$(CC) -c $(CFLAGS) $(PANGO_CFLAGS) -o $@ $^ 
 
 
-gtksharpglue-2.0.dll: $(GLUE_OBJS)
-	$(DLLWRAP) --output-lib=libpangosharpglue-2.0.a --dllname=pangosharpglue-2.0.dll --driver-name=gcc --output-def=pangosharpglue-2.0.def $(GLUE_OBJS) $(PANGO_LIBS)
+gtksharpglue-2.dll: $(GLUE_OBJS)
+	$(DLLWRAP) --output-lib=libpangosharpglue-2.a --dllname=pangosharpglue-2.dll --driver-name=gcc --output-def=pangosharpglue-2.def $(GLUE_OBJS) $(PANGO_LIBS)
 
 
 clean:
-	rm -f pangosharpglue-2.0.dll *.o libpangosharpglue-2.0.a
+	rm -f pangosharpglue-2.dll *.o libpangosharpglue-2.a
diff --git a/sample/TreeViewDemo.cs b/sample/TreeViewDemo.cs
index 5fcaa1b01..0e77f1084 100644
--- a/sample/TreeViewDemo.cs
+++ b/sample/TreeViewDemo.cs
@@ -30,6 +30,7 @@ namespace GtkSamples {
 
 			TreeView tv = new TreeView (store);
 			tv.HeadersVisible = true;
+			tv.EnableSearch = false;
 
 			tv.AppendColumn ("Name", new CellRendererText (), "text", 0);
 			tv.AppendColumn ("Type", new CellRendererText (), "text", 1);