diff --git a/ChangeLog b/ChangeLog
index 8ef330eddd..a721c212ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-21  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
+	* sys/ximage/Makefile.am:
+	* sys/ximage/ximage.c: (plugin_init):
+	* sys/ximage/ximagesink.c:
+	Prepare for adding ximagesrc, rename of plugin to ximage etc.
+	
+
 2005-07-21  Wim Taymans  <wim@fluendo.com>
 
 	* ext/ogg/gstoggdemux.c: (gst_ogg_pad_event),
diff --git a/sys/ximage/Makefile.am b/sys/ximage/Makefile.am
index abdb04ff14..b6c8bc1519 100644
--- a/sys/ximage/Makefile.am
+++ b/sys/ximage/Makefile.am
@@ -1,12 +1,12 @@
-plugin_LTLIBRARIES = libgstximagesink.la
+plugin_LTLIBRARIES = libgstximage.la
 
-libgstximagesink_la_SOURCES =  ximagesink.c 
-libgstximagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS)
-libgstximagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstximagesink_la_LIBADD = \
+libgstximage_la_SOURCES =  ximagesink.c ximage.c
+libgstximage_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS)
+libgstximage_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstximage_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
 	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
 $(X_LIBS) $(XSHM_LIBS)
-libgstximagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la
+libgstximage_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la
 
 noinst_HEADERS = ximagesink.h 
diff --git a/sys/ximage/ximage.c b/sys/ximage/ximage.c
new file mode 100644
index 0000000000..522e07d7da
--- /dev/null
+++ b/sys/ximage/ximage.c
@@ -0,0 +1,47 @@
+/* GStreamer
+ * Copyright (C) <2003> Julien Moutte <julien@moutte.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ximagesink.h"
+
+GST_DEBUG_CATEGORY (gst_debug_ximagesink);
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  if (!gst_element_register (plugin, "ximagesink",
+          GST_RANK_SECONDARY, GST_TYPE_XIMAGESINK))
+    return FALSE;
+
+  GST_DEBUG_CATEGORY_INIT (gst_debug_ximagesink, "ximagesink", 0,
+      "ximagesink element");
+
+  return TRUE;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    "ximage",
+    "XFree86 video output and input elements based on standard Xlib calls",
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index 50daa4083b..80b4b36b9e 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -30,7 +30,8 @@
 
 /* Debugging category */
 #include <gst/gstinfo.h>
-GST_DEBUG_CATEGORY_STATIC (gst_debug_ximagesink);
+
+GST_DEBUG_CATEGORY_EXTERN (gst_debug_ximagesink);
 #define GST_CAT_DEFAULT gst_debug_ximagesink
 
 typedef struct
@@ -1881,22 +1882,3 @@ gst_ximagesink_get_type (void)
 
   return ximagesink_type;
 }
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  if (!gst_element_register (plugin, "ximagesink",
-          GST_RANK_SECONDARY, GST_TYPE_XIMAGESINK))
-    return FALSE;
-
-  GST_DEBUG_CATEGORY_INIT (gst_debug_ximagesink, "ximagesink", 0,
-      "ximagesink element");
-
-  return TRUE;
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "ximagesink",
-    "XFree86 video output plugin based on standard Xlib calls",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)