diff --git a/ext/libfame/Makefile.am b/ext/libfame/Makefile.am
index e272082e77..a0b42a3221 100644
--- a/ext/libfame/Makefile.am
+++ b/ext/libfame/Makefile.am
@@ -2,7 +2,7 @@ plugindir = $(libdir)/gst
 
 plugin_LTLIBRARIES = libgstlibfame.la
 
-libgstlibfame_la_SOURCES = gstlibfame.c	
+libgstlibfame_la_SOURCES = gstlibfame.c	gstfamedec.c
 libgstlibfame_la_CFLAGS = $(GST_CFLAGS)
 libgstlibfame_la_LIBADD = $(LIBFAME_LIBS) 
 libgstlibfame_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst/modplug/gstmodplug.cc b/gst/modplug/gstmodplug.cc
index d21a55bb02..fe0b31f8f0 100644
--- a/gst/modplug/gstmodplug.cc
+++ b/gst/modplug/gstmodplug.cc
@@ -362,7 +362,7 @@ gst_modplug_loop (GstElement *element)
       GST_BUFFER_SIZE( buffer_out ) = modplug->length;
  	  
       total_samples+=1152;		
-	  GST_BUFFER_TIMESTAMP( buffer_out ) = total_samples * 1000000LL / modplug->frequency;
+	  GST_BUFFER_TIMESTAMP( buffer_out ) = total_samples * GST_SECOND / modplug->frequency;
  	  	
 	  gst_pad_push( srcpad, buffer_out );
 	  gst_element_yield (element);