diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 21d6da04b13c..c10fba9835d0 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ffmpeg
-DISTVERSION=	2007-04-29
-PORTREVISION=	3
+DISTVERSION=	2007-05-30
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ahze
@@ -37,8 +36,6 @@ SHLIB_VER=	1
 PLIST_SUB=	SHLIB_VER=${SHLIB_VER}
 USE_LDCONFIG=	yes
 
-CONFLICTS=	ffmpeg-[0-9]*
-
 MAN1=		ffmpeg.1
 
 ##
@@ -83,10 +80,10 @@ FFMPEG_LDFLAGS+=		-la52
 CONFIGURE_ARGS+=	--disable-liba52
 .endif
 ## dts
-.ifdef(WITH_DTS) || exists(${LOCALBASE}/lib/libdca.a)
-LIB_DEPENDS+=		dca.0:${PORTSDIR}/multimedia/libdca
-CONFIGURE_ARGS+=	--enable-libdts
-.endif
+#.ifdef(WITH_DTS) || exists(${LOCALBASE}/lib/libdca.a)
+#LIB_DEPENDS+=		dca.0:${PORTSDIR}/multimedia/libdca
+#CONFIGURE_ARGS+=	--enable-libdts
+#.endif
 ## faac
 .ifdef(WITH_FAAC) || exists(${LOCALBASE}/lib/libfaac.so)
 LIB_DEPENDS+=		faac.0:${PORTSDIR}/audio/faac
@@ -184,20 +181,15 @@ LIB_DEPENDS+=		xvidcore.4:${PORTSDIR}/multimedia/xvid
 CONFIGURE_ARGS+=	--enable-xvid
 .endif
 
-## bktr
-.ifdef(WITHOUT_BKTR)
-CONFIGURE_ARGS+=	--disable-bktr
-.endif
-
 pre-everything::
 .ifndef(WITHOUT_A52)
 	@${ECHO_MSG} 'You can disable liba52 support by defining WITHOUT_LIBA52'
 	@${ECHO_MSG}
 .endif
-.ifndef(WITH_DTS)
-	@${ECHO_MSG} 'Define WITH_DTS to enable DTS codec'
-	@${ECHO_MSG}
-.endif
+#.ifndef(WITH_DTS)
+#	@${ECHO_MSG} 'Define WITH_DTS to enable DTS codec'
+#	@${ECHO_MSG}
+#.endif
 .ifndef(WITH_FAAC)
 	@${ECHO_MSG} 'Define WITH_FAAC to enable FAAC codec'
 	@${ECHO_MSG}
@@ -239,10 +231,6 @@ pre-everything::
 	@${ECHO_MSG} 'Define WITH_XVID to enable XVID codec'
 	@${ECHO_MSG}
 .endif
-.ifndef(WITHOUT_BKTR)
-	@${ECHO_MSG} 'Define WITHOUT_BKTR to disable bktr video grab'
-	@${ECHO_MSG}
-.endif
 
 post-patch:
 # Faad compat
@@ -322,13 +310,17 @@ post-configure:
 		-e 's|^(PIC[[:space:]]*=.*)$$|\1 -fpic -fPIC -DPIC|' \
 		${WRKSRC}/config.mak
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${PREFIX}/etc/ffserver.conf-dist
+	if [ ! -f ${PREFIX}/etc/ffserver.conf ]; then \
+		${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${PREFIX}/etc; \
+	fi
 .ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
 .for file in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .for file in ${DOC_DOCFILES}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 7d108db8ef8a..eeabf2fc514a 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,3 +1,3 @@
-MD5 (ffmpeg-2007-04-29.tar.bz2) = ba24faba9b09397a241ec7bac52282f5
-SHA256 (ffmpeg-2007-04-29.tar.bz2) = 708dcb08e4aaad7e66a803caaca22af1fa1572749bd8c398a0a1871a48c5ee03
-SIZE (ffmpeg-2007-04-29.tar.bz2) = 2234128
+MD5 (ffmpeg-2007-05-30.tar.bz2) = 85d6f1a5657ca9c7730dac76c1cca883
+SHA256 (ffmpeg-2007-05-30.tar.bz2) = fa2237b2852ea8f01b329863f9b07f72865a1f58af5d001904d67f974ab0e18b
+SIZE (ffmpeg-2007-05-30.tar.bz2) = 2256282
diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure
index 1aca92796ad9..aa9b8f17d1ed 100644
--- a/multimedia/ffmpeg/files/patch-configure
+++ b/multimedia/ffmpeg/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Fri Apr 27 03:13:50 2007
-+++ configure	Thu May  3 09:28:33 2007
-@@ -208,11 +208,11 @@
+--- configure.orig	Sun May 27 12:31:02 2007
++++ configure	Wed May 30 21:50:21 2007
+@@ -210,11 +210,11 @@
  
  # "tr '[a-z]' '[A-Z]'" is a workaround for Solaris tr not grokking "tr a-z A-Z"
  toupper(){
@@ -14,7 +14,7 @@
  }
  
  set_all(){
-@@ -986,15 +986,9 @@
+@@ -1020,15 +1020,9 @@
      enable fast_unaligned
    ;;
    x86_64|amd64)
@@ -32,16 +32,7 @@
    ;;
    # armv4l is a subset of armv[567]*l
    arm|armv[4567]*l)
-@@ -1591,7 +1585,7 @@
- enabled amr_nb     && require libamrnb amrnb/interf_dec.h Speech_Decode_Frame_init -lamrnb -lm
- enabled amr_wb     && require libamrwb amrwb/dec_if.h D_IF_init -lamrwb -lm
- enabled liba52     && require liba52 a52dec/a52.h a52_init -la52
--enabled libdts     && require libdts dts.h dts_init -ldts -lm
-+enabled libdts     && require libdca dca.h dca_init -ldca -lm
- enabled libgsm     && require libgsm gsm.h gsm_create -lgsm
- enabled libmp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm
- enabled libtheora  && require libtheora theora/theora.h theora_info_init -ltheora -logg
-@@ -1749,14 +1743,14 @@
+@@ -1781,14 +1775,14 @@
  # not all compilers support -Os
  test "$optimize" = "small" && check_cflags -Os
  
@@ -64,7 +55,7 @@
  
  # PIC flags for shared library objects where they are needed
  if enabled shared; then
-@@ -1965,15 +1959,15 @@
+@@ -1996,15 +1990,15 @@
  if enabled shared; then
    echo "BUILD_SHARED=yes" >> config.mak
    echo "PIC=-fPIC -DPIC" >> config.mak
@@ -85,7 +76,7 @@
    echo "SWSVERSION=$sws_version" >> config.mak
    echo "SLIBNAME=${SLIBNAME}" >> config.mak
    echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
-@@ -2001,7 +1995,7 @@
+@@ -2039,7 +2033,7 @@
  
  echo "SRC_PATH=\"$source_path\"" >> config.mak
  echo "SRC_PATH_BARE=$source_path" >> config.mak
@@ -94,7 +85,7 @@
  
  # Apparently it's not possible to portably echo a backslash.
  if enabled asmalign_pot; then
-@@ -2095,8 +2089,8 @@
+@@ -2119,8 +2113,8 @@
  Version: $version
  Requires: $requires
  Conflicts:
@@ -105,7 +96,7 @@
  EOF
  }
  
-@@ -2119,7 +2113,8 @@
+@@ -2143,7 +2137,8 @@
  Requires: $requires
  Conflicts:
  Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
diff --git a/multimedia/ffmpeg/pkg-plist b/multimedia/ffmpeg/pkg-plist
index 673ea74d02d7..55b46bce01bf 100644
--- a/multimedia/ffmpeg/pkg-plist
+++ b/multimedia/ffmpeg/pkg-plist
@@ -1,5 +1,7 @@
 bin/ffmpeg
 bin/ffserver
+@unexec if cmp -s %D/etc/ffserver.conf %D/etc/ffserver.conf-dist; then rm -f %D/etc/ffserver.conf; fi
+etc/ffserver.conf-dist
 include/ffmpeg/adler32.h
 include/ffmpeg/avcodec.h
 include/ffmpeg/avformat.h