diff --git a/ChangeLog b/ChangeLog
index 4c532ef7f9..754dcee1ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-19  Jan Schmidt  <jan.schmidt@sun.com>
+
+	* ext/Makefile.am:
+	Finish hooking up pulseaudio plugin to the build.
+
+	* ext/pulse/pulsemixerctrl.c:
+	Fix compilation error.
+
 2008-07-19  Jan Schmidt  <jan.schmidt@sun.com>
 
 	* po/LINGUAS:
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 6eb613e4b2..36b3771678 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -94,6 +94,13 @@ else
 DV1394_DIR =
 endif
 
+if USE_PULSE
+PULSE_DIR = pulse
+else
+PULSE_DIR =
+endif
+
+
 if USE_SHOUT2
 SHOUT2_DIR = shout2
 else
@@ -141,6 +148,7 @@ SUBDIRS = \
 	$(LIBMNG_DIR) \
 	$(LIBPNG_DIR) \
 	$(MIKMOD_DIR) \
+	$(PULSE_DIR) \
 	$(SHOUT2_DIR) \
 	$(SOUP_DIR) \
 	$(SPEEX_DIR) \
@@ -162,6 +170,7 @@ DIST_SUBDIRS = \
 	ladspa \
 	libcaca \
 	libpng \
+	pulse \
 	raw1394 \
 	shout2 \
 	soup \
diff --git a/ext/pulse/pulsemixerctrl.c b/ext/pulse/pulsemixerctrl.c
index 5dac558c33..f2fb3c5d2a 100644
--- a/ext/pulse/pulsemixerctrl.c
+++ b/ext/pulse/pulsemixerctrl.c
@@ -490,6 +490,9 @@ gst_pulsemixer_ctrl_timeout_event (pa_mainloop_api * a, pa_time_event * e,
 static void
 restart_time_event (GstPulseMixerCtrl * c)
 {
+  struct timeval tv;
+  pa_mainloop_api *api;
+
   g_assert (c);
 
   if (c->time_event)
@@ -498,9 +501,8 @@ restart_time_event (GstPulseMixerCtrl * c)
   /* Updating the volume too often will cause a lot of traffic
    * when accessing a networked server. Therefore we make sure
    * to update the volume only once every 50ms */
-  struct timeval tv;
 
-  pa_mainloop_api *api = pa_threaded_mainloop_get_api (c->mainloop);
+  api = pa_threaded_mainloop_get_api (c->mainloop);
 
   c->time_event =
       api->time_new (api, pa_timeval_add (pa_gettimeofday (&tv), UPDATE_DELAY),