diff --git a/ChangeLog b/ChangeLog
index 6f17e6135b..f48906c682 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-03  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/swfdec/Makefile.am:
+	  Don't set plugindir.
+
+	* ext/swfdec/gstswfdec.c:
+	  GST_PLUGIN_DEFINE_STATIC isn't a good idea for installed plugins.
+
 2006-04-03  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* configure.ac:
diff --git a/ext/swfdec/Makefile.am b/ext/swfdec/Makefile.am
index d4e989f89d..2d7f41d3be 100644
--- a/ext/swfdec/Makefile.am
+++ b/ext/swfdec/Makefile.am
@@ -1,5 +1,3 @@
-plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
-
 plugin_LTLIBRARIES = libgstswfdec.la
 
 libgstswfdec_la_SOURCES = gstswfdec.c
diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c
index dcd744aef8..7f945e6b4d 100644
--- a/ext/swfdec/gstswfdec.c
+++ b/ext/swfdec/gstswfdec.c
@@ -908,7 +908,7 @@ plugin_init (GstPlugin * plugin)
       GST_TYPE_SWFDEC);
 }
 
-GST_PLUGIN_DEFINE_STATIC (GST_VERSION_MAJOR,
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "swfdec",
     "Uses libswfdec to decode Flash video streams",