diff --git a/bitbake/pace-gui.bb b/bitbake/pace-gui.bb
index b6e21dd..b47ddb2 100644
--- a/bitbake/pace-gui.bb
+++ b/bitbake/pace-gui.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Simple GUI for entring a PIN and giving it to pace-tool"
 LICENSE     = "GPL"
 
-DEPENDS     = "ccid-tool"
-RDEPENDS    = "ccid-tool python-pygtk libglade"
+DEPENDS     = "ccid-emulator"
+RDEPENDS    = "ccid-emulator python-pygtk libglade"
 
 SRC_URI = "svn://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard;module=pace-gui;proto=https;rev=145"
 
diff --git a/bitbake/shr-nfc.patch b/bitbake/shr-nfc.patch
new file mode 100644
index 0000000..88b9e92
--- /dev/null
+++ b/bitbake/shr-nfc.patch
@@ -0,0 +1,24 @@
+--- recipes/tasks/task-shr-minimal.bb.org	2010-06-11 23:51:20.815393998 +0200
++++ recipes/tasks/task-shr-minimal.bb	2010-06-11 23:54:15.036598596 +0200
+@@ -60,6 +60,7 @@
+ 	${PN}-x \
+ 	${PN}-apps \
+ 	${PN}-gtk \
++	${PN}-nfc \
+ "
+ 
+ 
+@@ -144,3 +145,13 @@
+   matchbox-keyboard-im \
+ "
+ 
++RDEPENDS_${PN}-nfc = "\
++  pcsc-lite \
++  libpcsclite \
++  ccid \
++  opensc \
++  libnfc \
++  ifdnfc \
++  ccid-emulator \
++  pace-gui \
++"
diff --git a/bitbake/vscarchitecture.bb b/bitbake/vscarchitecture.bb
index da9477f..e78ced5 100644
--- a/bitbake/vscarchitecture.bb
+++ b/bitbake/vscarchitecture.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Virtual Smartcard with PCSC Driver and CCID to PCSC Gadget"
 LICENSE     = "GPL"
 
-DEPENDS     = "ccid-tool virtualsmartcard picctopcsc"
+DEPENDS     = "ccid-emulator virtualsmartcard picctopcsc"