diff --git a/binr/r2pm/d/bcl b/binr/r2pm/d/bcl
index cd000a8e6f..a2352fc30a 100644
--- a/binr/r2pm/d/bcl
+++ b/binr/r2pm/d/bcl
@@ -7,11 +7,12 @@ R2PM_INSTALL() {
 	#export PKG_CONFIG_PATH="${R2PM_PREFIX}/lib/pkgconfig"
 	./configure --prefix="${R2PM_PREFIX}" || exit 1
 	${MAKE} -C bcl || exit 1
-	${MAKE} -C bcl install R2PM_PLUGDIR=${R2PM_PLUGDIR} || exit 1
+	${MAKE} -C bcl install R2PM_PLUGDIR="${R2PM_PLUGDIR}" || exit 1
 }
 
 R2PM_UNINSTALL() {
-	${MAKE} -C bcl uninstall
+	rm ${R2PM_PLUGDIR}/*bcl* || exit 1
+	#${MAKE} -C bcl uninstall
 }
 
 R2PM_END
diff --git a/binr/r2pm/r2pm b/binr/r2pm/r2pm
index ab6e8b6e2e..bcdf604a7a 100755
--- a/binr/r2pm/r2pm
+++ b/binr/r2pm/r2pm
@@ -177,7 +177,11 @@ r2pm_uninstall() {
 			ACTION=Uninstall
 			. "${FILE}"
 			R2PM_UNINSTALL
-			R2PM_UNREGISTER
+			if [ $? = 0 ]; then
+				R2PM_UNREGISTER
+			else
+				echo Oops
+			fi
 		else
 			echo "Unable to find package template for $2." > /dev/stderr
 			echo "Use -uu to remove it from the database." > /dev/stderr