diff --git a/karaf/client/NOTICE b/karaf/client/NOTICE
new file mode 100644
index 0000000..51f8678
--- /dev/null
+++ b/karaf/client/NOTICE
@@ -0,0 +1,19 @@
+Apache Felix Karaf :: Client
+Copyright 2007-2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+
+
+III. License Summary
+- Apache License 2.0
+
+
diff --git a/karaf/client/pom.xml b/karaf/client/pom.xml
index bdf4b2b..3c851d2 100644
--- a/karaf/client/pom.xml
+++ b/karaf/client/pom.xml
@@ -33,6 +33,10 @@
     <version>0.9.0-SNAPSHOT</version>
     <name>Apache Felix Karaf :: Client</name>
 
+    <properties>
+        <appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>jline</groupId>
@@ -63,7 +67,7 @@
                         <Class-Path>
                             ../system/org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar
                             ../system/org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar
-                            ../system/org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.console/${pom.version}/org.apache.felix.karaf.gshell.console-${pom.version}.jar
+                            ../system/org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.console/${pom.version}/org.apache.felix.karaf.shell.console-${pom.version}.jar
                         </Class-Path>
                         <Bundle-Name>Apache Felix Karaf Shell Client</Bundle-Name>
                         <Bundle-Description>Shell client bundle for Apache Felix Karaf.</Bundle-Description>
@@ -78,6 +82,7 @@
                             META-INF;-split-package:=merge-first
                         </Private-Package>
                         <Import-Package>!*</Import-Package>
+                        <Include-Resource>{maven-resources},META-INF/NOTICE=NOTICE</Include-Resource>
                     </instructions>
                     <unpackBundle>true</unpackBundle>
                 </configuration>
diff --git a/karaf/client/src/main/resources/client.login.conf b/karaf/client/src/main/resources/client.login.conf
index dc2b0ba..1e190f1 100644
--- a/karaf/client/src/main/resources/client.login.conf
+++ b/karaf/client/src/main/resources/client.login.conf
@@ -22,5 +22,5 @@
 //
 
 RshClient {
-    org.apache.geronimo.gshell.remote.client.auth.RemoteLoginModule required;
+    org.apache.geronimo.shell.remote.client.auth.RemoteLoginModule required;
 };