diff --git a/kukaFri-libs/Makefile b/kukaFri-libs/Makefile
index 3f658d225e235824c3705510ac738d2b52ad58bd..5ad2fcf800831125a943b6648708a71f40319bf2 100644
--- a/kukaFri-libs/Makefile
+++ b/kukaFri-libs/Makefile
@@ -1,17 +1,25 @@
-# robotpkg Makefile for: manipulation/kukaFri-libs
-# Created: Severin Lemaignan on Tue, 31 Aug 2010
+# robotpkg Makefile for: hardware/kukaFri-libs
+# Created: Xavier Broquere on Tue, 26 Oct 2010
#
-DISTNAME= kukaFri-libs-1.2
-CATEGORIES= manipulation
-MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=kukaFri-libs/}
-# TODO: properly add an interactive fetch
-
+VERSION= 1.2
+DISTNAME= kukaFri-libs-${VERSION}
+CATEGORIES= hardware
+COMMENT= Package based on the Fast Research Interface (FRI) provided by Kuka
MAINTAINER= xavier.broquere@laas.fr
-COMMENT= KuKa low-level libraries for their arm
+
+
LICENSE= kuka-license
USE_LANGUAGES+= c c++
+INTERACTIVE_STAGE= fetch
+FETCH_MESSAGE+= " The file ${DISTNAME}${EXTRACT_SUFX} containing the kukaFri-libs version ${VERSION}"
+FETCH_MESSAGE+= ""
+FETCH_MESSAGE+= " must be put manually into:"
+FETCH_MESSAGE+= " ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}"
+
+
+
include ../../mk/sysdep/cmake.mk
include ../../mk/robotpkg.mk
diff --git a/kukaFri-libs/distinfo b/kukaFri-libs/distinfo
index 89385f7b235cce883e8384f4c5f02bc330aa7d5a..bf526525689a152d8007a39d687ee07d60bea70f 100644
--- a/kukaFri-libs/distinfo
+++ b/kukaFri-libs/distinfo
@@ -1,4 +1,3 @@
-SHA1 (kukaFri-libs-1.2.tar.gz) = 06643f362b3e26241d24f5ee3c1b6974c4b17498
-RMD160 (kukaFri-libs-1.2.tar.gz) = eb0e66bcd8cad83fb0e080ed6023a5a2f06ec516
-Size (kukaFri-libs-1.2.tar.gz) = 21895 bytes
-SHA1 (patch-aa) = ce631c05ae0e1aa3575d928efd569a26e4a722a3
+SHA1 (kukaFri-libs-1.2.tar.gz) = 2127990680c8fde2a4feb4dca38299c13a2c055d
+RMD160 (kukaFri-libs-1.2.tar.gz) = e41a68606171919a8ff1617a028e08228eb4545a
+Size (kukaFri-libs-1.2.tar.gz) = 21905 bytes
diff --git a/kukaFri-libs/patches/patch-aa b/kukaFri-libs/patches/patch-aa
deleted file mode 100644
index 9093a4baa71c56db139243e56c6d13ce4079f6c4..0000000000000000000000000000000000000000
--- a/kukaFri-libs/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt~ 2010-10-01 11:58:19.000000000 +0200
-+++ CMakeLists.txt 2010-10-26 11:42:40.085659408 +0200
-@@ -36,7 +36,7 @@
- endif( NOT PROJECT_MAJOR_VERSION)
-
- if( NOT PROJECT_MINOR_VERSION)
--set( PROJECT_MINOR_VERSION 0)
-+set( PROJECT_MINOR_VERSION 2)
- endif( NOT PROJECT_MINOR_VERSION)
-
- set( KUKAFRI_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}")