diff --git a/ChangeLog b/ChangeLog
index 35f0698985..2535c4762e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-30  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* autogen.sh:
+	* configure.ac:
+	  Make autogen work again.
+
 2005-08-30  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac:
diff --git a/autogen.sh b/autogen.sh
index d211d92e67..ed1d3c1869 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,7 +3,7 @@
 
 DIE=0
 package=gst-plugins
-srcfile=gst/law/alaw.c
+srcfile=gst/librfb/gstrfbsrc.c
 
 # a quick cvs co if necessary to alleviate the pain - may remove this
 # when developers get a clue ;)
diff --git a/common b/common
index 89d82b662d..3fb3bedc91 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 89d82b662da00096b70e70a7a102b294acaae6dd
+Subproject commit 3fb3bedc9180bab9dc8c2dc784c9327bd1cc8109
diff --git a/configure.ac b/configure.ac
index 88f234bd1d..8192f5931c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ AS_LIBTOOL_TAGS([CXX])
 AM_PROG_LIBTOOL
 
 dnl FIXME take something else ?
-AC_CONFIG_SRCDIR([gst/law/alaw.c])
+AC_CONFIG_SRCDIR([gst/librfb/gstrfbsrc.c])
 AM_CONFIG_HEADER(config.h)
 
 dnl Add parameters for aclocal
@@ -289,13 +289,10 @@ GST_PLUGINS_ALL="\
 		qtdemux \
 		realmedia \
 		silence \
-<<<<<<< configure.ac
-=======
 		udp     \
 		videobox \
 		wavenc \
 		wavparse \
->>>>>>> 1.580
 		mpegaudioparse \
                 "