diff --git a/ChangeLog b/ChangeLog
index b1c9a61029..3cbb4d2407 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-12-21  David Schleef  <ds@schleef.org>
+
+	* many, many files: Merge CAPS branch.  This includes:
+	  - implemention of GstValue and several GstValue types
+	  - implemention of GstStructure
+	  - entire rewrite of GstCaps
+	  - removal of GstProps
+	  - many changes to GstPad to compensate for new caps paradigm
+	  - removal of GstBufferpool
+	* gst/Makefile.am, gst/gst.h, gst/gstpad.h, gst/gsttypefind.h,
+	gstvalue.h, gst/gstcaps[2]*.[ch]:
+	  - rename gstcaps2.[ch] to gstcaps.[ch]
+
 2003-12-21  Ronald Bultje  <rbultje@ronald.bitfreak.net>
 
 	* gst/gstqueue.c: (gst_queue_handle_pending_events),
diff --git a/gst/Makefile.am b/gst/Makefile.am
index 3e162421f1..5284d95db2 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -80,7 +80,7 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES =		\
 	gstatomic.c		\
 	gstbin.c		\
 	gstbuffer.c		\
-	gstcaps2.c		\
+	gstcaps.c		\
 	gstclock.c		\
 	gstcpu.c		\
 	gstdata.c		\
@@ -141,7 +141,7 @@ gst_headers =			\
 	gstobject.h		\
 	gstbin.h		\
 	gstbuffer.h		\
-	gstcaps2.h		\
+	gstcaps.h		\
 	gstclock.h		\
 	gstcompat.h		\
 	gstcpu.h		\
diff --git a/gst/gst.h b/gst/gst.h
index 91652ebd9f..8463f2dfd1 100644
--- a/gst/gst.h
+++ b/gst/gst.h
@@ -33,7 +33,7 @@
 
 #include <gst/gstbin.h>
 #include <gst/gstbuffer.h>
-#include <gst/gstcaps2.h>
+#include <gst/gstcaps.h>
 #include <gst/gstclock.h>
 #include <gst/gstcpu.h>
 #include <gst/gstelement.h>
diff --git a/gst/gstcaps2.c b/gst/gstcaps.c
similarity index 100%
rename from gst/gstcaps2.c
rename to gst/gstcaps.c
diff --git a/gst/gstcaps2.h b/gst/gstcaps.h
similarity index 100%
rename from gst/gstcaps2.h
rename to gst/gstcaps.h
diff --git a/gst/gstpad.h b/gst/gstpad.h
index 85a210deb2..ee6bd9d4da 100644
--- a/gst/gstpad.h
+++ b/gst/gstpad.h
@@ -28,7 +28,7 @@
 
 #include <gst/gstobject.h>
 #include <gst/gstbuffer.h>
-#include <gst/gstcaps2.h>
+#include <gst/gstcaps.h>
 #include <gst/gstevent.h>
 #include <gst/gstprobe.h>
 #include <gst/gstquery.h>
diff --git a/gst/gsttypefind.h b/gst/gsttypefind.h
index 2c27178083..77f7dc7e79 100644
--- a/gst/gsttypefind.h
+++ b/gst/gsttypefind.h
@@ -24,7 +24,7 @@
 #define __GST_TYPE_FIND_H__
 
 #include <gst/gstbuffer.h>
-#include <gst/gstcaps2.h>
+#include <gst/gstcaps.h>
 #include <gst/gstplugin.h>
 #include <gst/gstpluginfeature.h>
 #include <gst/gsttypes.h>
diff --git a/gst/gstvalue.h b/gst/gstvalue.h
index 6c19291d7a..cb2345483d 100644
--- a/gst/gstvalue.h
+++ b/gst/gstvalue.h
@@ -21,7 +21,7 @@
 #define __GST_VALUE_H__
 
 #include <gst/gstconfig.h>
-#include <gst/gstcaps2.h>
+#include <gst/gstcaps.h>
 
 G_BEGIN_DECLS