diff --git a/package/public/cdrdao/cdrdao.conf b/package/public/cdrdao/cdrdao.conf
index 3c97c9b01..32b1b97ae 100644
--- a/package/public/cdrdao/cdrdao.conf
+++ b/package/public/cdrdao/cdrdao.conf
@@ -23,24 +23,8 @@
 [ "$arch" = "x86" -a "$ROCKCFG_X86_BITS" = "64" ] && \
 	preconf="cp -v $root/usr/share/automake-1.9/config.{sub,guess} scsilib/conf"
 
-cdrdao_main() {
-	unzip -vo $archdir/pccts133mr.zip
-	cd pccts
-	patch -p0 < $confdir/make-more.diff
-	$MAKE
-	for x in antlr dlg genmk sor
-	  do cp bin/$x $root/usr/bin ; done
-	mkdir -p $root/usr/include/pccts
-	cp h/* $root/usr/include/pccts
-	cd ..
-
-	eval ./configure $confopt
-	eval $MAKE ; eval $MAKE install
-}
-
 # newer versions of gcc (3.3 on) issue an
 # error on inclusion of varargs.h
-var_append GCC_WRAPPER_APPEND ' ' '-DPCCTS_USE_STDARG'
+# var_append GCC_WRAPPER_APPEND ' ' '-DPCCTS_USE_STDARG'
 
-custmain="cdrdao_main"
-srctar="$pkg-$ver.tar.bz2"
+hook_add postmake 5 "mkdir -p $root/usr/include/pccts ; cp pccts/h/* $root/usr/include/pccts"
diff --git a/package/public/cdrdao/cdrdao.desc b/package/public/cdrdao/cdrdao.desc
index 6e1e1ba5c..f34b6c41f 100644
--- a/package/public/cdrdao/cdrdao.desc
+++ b/package/public/cdrdao/cdrdao.desc
@@ -40,9 +40,8 @@
 
 [L] GPL
 [S] Stable
-[V] 1.1.9
+[V] 1.2.1
 [P] X -?---5---9 160.700
 
-[D] 2292111665 cdrdao-1.1.9.tar.gz http://dl.sourceforge.net/sourceforge/cdrdao/
-[D] 1992468110 pccts133mr.zip http://www.polhode.com/
+[D] 759937692 cdrdao-1.2.1.tar.gz http://dl.sourceforge.net/sourceforge/cdrdao/
 
diff --git a/package/public/cdrdao/x86_64-support.patch b/package/public/cdrdao/x86_64-support.patch
deleted file mode 100644
index 42e7cd206..000000000
--- a/package/public/cdrdao/x86_64-support.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/public/cdrdao/x86_64-support.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./scsilib/RULES/x86_64-linux-cc.rul.old	1970-01-01 01:00:00.000000000 +0100
-+++ ./scsilib/RULES/x86_64-linux-cc.rul	2004-12-28 14:57:29.000000000 +0100
-@@ -0,0 +1,70 @@
-+#ident "@(#)i586-linux-cc.rul	1.5 02/10/15 "
-+###########################################################################
-+# Written 1996 by J. Schilling
-+###########################################################################
-+#
-+# Platform dependent MACROS for Linux
-+#
-+###########################################################################
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; see the file COPYING.  If not, write to
-+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-+###########################################################################
-+include $(SRCROOT)/$(RULESDIR)/rules.prg
-+###########################################################################
-+
-+CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
-+CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
-+
-+CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
-+COPTS=
-+CWOPTS=		-Wall -Wtraditional \
-+		-Wshadow -Wmissing-prototypes -Wstrict-prototypes
-+COPTOPT=	-O
-+KDEFINES=	-DKERNEL -D_KERNEL
-+COPTDYN=	-fPIC
-+COPTGPROF=	-pg
-+
-+LIB_PREFIX=	lib
-+LIB_SUFFIX=	.a
-+SHL_SUFFIX=	.so.1.0
-+
-+#LIB_SOCKET=	-lsocket -lnsl -ldl
-+LIB_SOCKET=	
-+LIB_MATH=	-lm
-+#LIB_KVM=	-lkvm
-+LIB_KVM=	
-+
-+LIBS_PATH=	-L$(OLIBSDIR)
-+
-+LDFLAGS=	$(LDOPTS) $(LDOPTX)
-+LDLIBS=		$(LIBS) $(LIBX)
-+
-+#LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH)
-+LDOPTS=		$(LIBS_PATH) $(LDPATH)
-+LDOPTDYN=	-shared -Wl,-soname,$(TARGET)
-+LNDYNLIB=	@$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
-+
-+FLOAT_OPTIONS=	
-+
-+CC=		@echo "	==> COMPILING \"$@\""; gcc
-+LDCC=		@echo "	==> LINKING \"$@\""; gcc
-+DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; gcc
-+RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; true
-+ARFLAGS=	cr
-+LORDER=		echo
-+TSORT=		cat
-+
-+RMDEP=		:
-+MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
-+MKDEP_OUT=