diff --git a/configure.ac b/configure.ac
index 8b10894..87e765d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -904,12 +904,12 @@ AC_ARG_ENABLE(filewriter_vorbis,
 )
 
 if test "x$enable_filewriter_vorbis" = "xyes"; then
-   PKG_CHECK_MODULES(OGG_VORBIS, [ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0],
+   PKG_CHECK_MODULES(OGG_VORBISENC, [ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0],
    [have_vorbisenc=yes], [have_vorbisenc=no])
    if test "x$have_vorbisenc" = "xyes"; then
       AC_DEFINE(FILEWRITER_VORBIS, 1, [Define if Vorbis output part should be built])
-      FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS  `pkg-config --cflags vorbisenc`"
-      FILEWRITER_LIBS="$FILEWRITER_LIBS  `pkg-config --libs vorbisenc`"
+      FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $OGG_VORBISENC_CFLAGS"
+      FILEWRITER_LIBS="$FILEWRITER_LIBS $OGG_VORBISENC_LIBS"
    fi
 fi
 
diff --git a/extra.mk.in b/extra.mk.in
index 9be5761..4e95bbf 100644
--- a/extra.mk.in
+++ b/extra.mk.in
@@ -81,6 +81,8 @@ NOTIFY_CFLAGS ?= @NOTIFY_CFLAGS@
 NOTIFY_LIBS ?= @NOTIFY_LIBS@
 OGG_VORBIS_CFLAGS ?= @OGG_VORBIS_CFLAGS@
 OGG_VORBIS_LIBS ?= @OGG_VORBIS_LIBS@
+OGG_VORBISENC_CFLAGS ?= @OGG_VORBISENC_CFLAGS@
+OGG_VORBISENC_LIBS ?= @OGG_VORBISENC_LIBS@
 OPENAL_CFLAGS ?= @OPENAL_CFLAGS@
 OPENAL_LIBS ?= @OPENAL_LIBS@
 OSS_CFLAGS ?= @OSS_CFLAGS@
diff --git a/src/filewriter/Makefile b/src/filewriter/Makefile
index 0b23ecd..f659f1f 100644
--- a/src/filewriter/Makefile
+++ b/src/filewriter/Makefile
@@ -13,5 +13,5 @@ include ../../extra.mk
 plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${GTK_CFLAGS}   ${FILEWRITER_CFLAGS} ${OGG_VORBIS_CFLAGS} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${GTK_CFLAGS} ${FILEWRITER_CFLAGS} -I../..
 LIBS += ${GTK_LIBS} ${FILEWRITER_LIBS}