diff --git a/t/GtkAccelLabel.t b/t/GtkAccelLabel.t
index cbcaa66..8da1253 100644
--- a/t/GtkAccelLabel.t
+++ b/t/GtkAccelLabel.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 use strict;
-use Gtk2::TestHelper tests => 4;
+use Gtk2::TestHelper tests => 5;
 
 # $Id$
 
@@ -9,6 +9,10 @@ my $button = Gtk2::Button -> new("Blub");
 my $label = Gtk2::AccelLabel -> new("Bla");
 isa_ok($label, "Gtk2::AccelLabel");
 
+# undef for no accel-widget 
+$label -> set_accel_widget(undef);
+is($label -> get_accel_widget(), undef);
+
 $label -> set_accel_widget($button);
 is($label -> get_accel_widget(), $button);
 
@@ -17,5 +21,5 @@ ok(! $label -> refetch());
 
 __END__
 
-Copyright (C) 2003 by the gtk2-perl team (see the file AUTHORS for the
+Copyright (C) 2003, 2010 by the gtk2-perl team (see the file AUTHORS for the
 full list).  See LICENSE for more information.
diff --git a/xs/GtkAccelLabel.xs b/xs/GtkAccelLabel.xs
index bdc4e43..d0d38a3 100644
--- a/xs/GtkAccelLabel.xs
+++ b/xs/GtkAccelLabel.xs
@@ -31,7 +31,7 @@ gtk_accel_label_new (class, string)
 	string
 
 ## GtkWidget* gtk_accel_label_get_accel_widget (GtkAccelLabel *accel_label)
-GtkWidget *
+GtkWidget_ornull *
 gtk_accel_label_get_accel_widget (accel_label)
 	GtkAccelLabel * accel_label
 
@@ -44,7 +44,7 @@ gtk_accel_label_get_accel_width (accel_label)
 void
 gtk_accel_label_set_accel_widget (accel_label, accel_widget)
 	GtkAccelLabel * accel_label
-	GtkWidget     * accel_widget
+	GtkWidget_ornull * accel_widget
 
 # TODO: The docs say that the "closure must be connected to an accelerator
 # group", but how do we find the GClosure that was created in the xsub for
