diff --git a/configure.ac b/configure.ac
index b77e2aae9c..9b7eca3197 100644
--- a/configure.ac
+++ b/configure.ac
@@ -685,7 +685,6 @@ AG_GST_CHECK_FEATURE(SHM, [POSIX shared memory source and sink], shm, [
     if test "x$HAVE_SYS_SOCKET_H" = "xyes"; then
         case $host in
         *-darwin* | *-macos10*)
-            AM_CONDITIONAL([HAVE_OSX], true)
             AC_DEFINE(HAVE_OSX,[1],[Apple Mac OS X operating system detected])
             HAVE_SHM=yes
             ;;
@@ -695,6 +694,7 @@ AG_GST_CHECK_FEATURE(SHM, [POSIX shared memory source and sink], shm, [
                 #include <sys/socket.h>
   	            ]),
                 HAVE_SHM=no)
+            AC_SUBST(SHM_LIBS, "-lrt")
             ;;
         esac
     else
diff --git a/sys/shm/Makefile.am b/sys/shm/Makefile.am
index dc89d8e6d3..3d1bf132f9 100644
--- a/sys/shm/Makefile.am
+++ b/sys/shm/Makefile.am
@@ -2,13 +2,8 @@ plugin_LTLIBRARIES = libgstshm.la
 
 libgstshm_la_SOURCES = shmpipe.c shmalloc.c gstshm.c gstshmsrc.c gstshmsink.c
 libgstshm_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) -DSHM_PIPE_USE_GLIB
-libgstshm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS)
-
-if HAVE_OSX
-libgstshm_la_LIBADD =
-else
-libgstshm_la_LIBADD = -lrt
-endif
+libgstshm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstshm_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(SHM_LIBS)
 
 libgstshm_la_LIBTOOLFLAGS = --tag=disable-static