diff --git a/devel/orc/Makefile b/devel/orc/Makefile
index de174f9dcf60..c31192a9e37f 100644
--- a/devel/orc/Makefile
+++ b/devel/orc/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	orc
-PORTVERSION=	0.4.19
-PORTREVISION=	2
+PORTVERSION=	0.4.21
 CATEGORIES=	devel
 MASTER_SITES= 	http://gstreamer.freedesktop.org/data/src/orc/
 
@@ -14,7 +13,7 @@ LICENSE=	BSD2CLAUSE BSD3CLAUSE
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake libtool:keepla pkgconfig
+USES=		gmake libtool:keepla pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS+=--disable-gtk-doc
diff --git a/devel/orc/distinfo b/devel/orc/distinfo
index f122f219db70..0d0f5cf271c4 100644
--- a/devel/orc/distinfo
+++ b/devel/orc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (orc-0.4.19.tar.gz) = e21f50321a21c33178bbe41ea8bd27c49ae60aeb8c22902a215f7141297fb59e
-SIZE (orc-0.4.19.tar.gz) = 752746
+SHA256 (orc-0.4.21.tar.xz) = 55c1fa6f8446ac328dd0b24ca3dd577136d65d890cfbe189949c4507b0cdfca0
+SIZE (orc-0.4.21.tar.xz) = 445676
diff --git a/devel/orc/files/patch-orc-Makefile.in b/devel/orc/files/patch-orc-Makefile.in
deleted file mode 100644
index 56f87fac410f..000000000000
--- a/devel/orc/files/patch-orc-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- orc/Makefile.in.orig	2010-09-18 23:58:41.578826120 +0200
-+++ orc/Makefile.in	2010-09-18 23:58:49.538047967 +0200
-@@ -324,7 +324,6 @@
- lib_LTLIBRARIES = liborc-@ORC_MAJORMINOR@.la
- liborc_@ORC_MAJORMINOR@_la_LIBADD = $(LIBM) $(LIBRT)
- liborc_@ORC_MAJORMINOR@_la_LDFLAGS = \
--	-version-info $(ORC_LIBVERSION) \
- 	-no-undefined -export-symbols-regex 'orc_'
- 
- liborc_@ORC_MAJORMINOR@_la_CFLAGS = $(ORC_CFLAGS) \
diff --git a/devel/orc/files/patch-orc-test-Makefile.in b/devel/orc/files/patch-orc-test-Makefile.in
deleted file mode 100644
index 514f2c5b1146..000000000000
--- a/devel/orc/files/patch-orc-test-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- orc-test/Makefile.in.orig	2010-09-19 00:02:22.545716366 +0200
-+++ orc-test/Makefile.in	2010-09-19 00:02:29.607626255 +0200
-@@ -243,7 +243,6 @@
- lib_LTLIBRARIES = liborc-test-@ORC_MAJORMINOR@.la
- liborc_test_@ORC_MAJORMINOR@_la_LIBADD = $(ORC_LIBS)
- liborc_test_@ORC_MAJORMINOR@_la_LDFLAGS = \
--	-version-info $(ORC_LIBVERSION) \
- 	-no-undefined -export-symbols-regex 'orc_'
- 
- liborc_test_@ORC_MAJORMINOR@_la_CFLAGS = $(ORC_CFLAGS) \
diff --git a/devel/orc/pkg-plist b/devel/orc/pkg-plist
index 499d4f10c37f..0071119acfcc 100644
--- a/devel/orc/pkg-plist
+++ b/devel/orc/pkg-plist
@@ -36,16 +36,14 @@ include/orc-0.4/orc/orcutils.h
 include/orc-0.4/orc/orcvariable.h
 include/orc-0.4/orc/orcx86.h
 include/orc-0.4/orc/orcx86insn.h
-lib/liborc-0.4.a
 lib/liborc-0.4.la
 lib/liborc-0.4.so
 lib/liborc-0.4.so.0
-lib/liborc-0.4.so.0.0.0
-lib/liborc-test-0.4.a
+lib/liborc-0.4.so.0.21.0
 lib/liborc-test-0.4.la
 lib/liborc-test-0.4.so
 lib/liborc-test-0.4.so.0
-lib/liborc-test-0.4.so.0.0.0
+lib/liborc-test-0.4.so.0.21.0
 libdata/pkgconfig/orc-0.4.pc
 share/aclocal/orc.m4
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1orc.orc