diff --git a/MANIFEST b/MANIFEST
index a2f0d0f..8951fa1 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,5 +1,10 @@
 .gitignore
+bin/carton
 Changes
+doc/carton-faq.pod
+doc/carton-install.pod
+doc/carton-list.pod
+doc/carton.pod
 inc/Module/Install.pm
 inc/Module/Install/Base.pm
 inc/Module/Install/Can.pm
@@ -8,12 +13,21 @@ inc/Module/Install/Makefile.pm
 inc/Module/Install/Metadata.pm
 inc/Module/Install/ReadmeFromPod.pm
 inc/Module/Install/Repository.pm
+inc/Module/Install/Scripts.pm
 inc/Module/Install/Win32.pm
 inc/Module/Install/WriteAll.pm
-lib/App/carton.pm
+lib/Carton.pm
+lib/Carton/CLI.pm
+lib/Carton/Doc/Carton.pod
+lib/Carton/Doc/FAQ.pod
+lib/Carton/Doc/Install.pod
+lib/Carton/Doc/List.pod
+lib/Carton/Tree.pm
+lib/Carton/Util.pm
 Makefile.PL
 MANIFEST			This list of files
 META.yml
 README
 t/00_compile.t
+TODO
 xt/pod.t
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index 0ef102f..50508e5 100644
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -13,3 +13,6 @@
 \.cvsignore
 \.shipit
 MYMETA
+local/
+\.carton
+carton.lock
diff --git a/t/00_compile.t b/t/00_compile.t
index 9f66699..485be2b 100644
--- a/t/00_compile.t
+++ b/t/00_compile.t
@@ -1,4 +1,4 @@
 use strict;
 use Test::More tests => 1;
 
-BEGIN { use_ok 'App::carton' }
+BEGIN { use_ok 'Carton' }