diff --git a/README b/README
index a3c452ddf..4a14040fd 100644
--- a/README
+++ b/README
@@ -28,7 +28,7 @@ $ ./bin/packstack --answer-file=ans.txt
 Option 2 (prompts for configuration options)
 $ ./bin/packstack
 
-thats it, if everything went well you can now start using openstack
+that's it, if everything went well you can now start using openstack
 $ cd
 $ . keystonerc_admin
 $ nova list
@@ -42,3 +42,17 @@ CONFIG_SWIFT_STORAGE_HOSTS :
         a comma seperate list of swift storage devices
         1.1.1.1  : create a testing loopback device and use this for storage
         1.1.1.1/sdb : use /dev/sdb on 1.1.1.1 as a storage device
+
+Logging
+
+The location of the log files and generated puppet manifests are in the 
+/var/tmp/packstack directory under a directory named by the date in which 
+packstack was run and a random string (e.g. /var/tmp/packstack/20131022-204316-Bf3Ek2).
+Inside, we find a manifest directory and the openstack-setup.log file; puppet
+manifests and a log file for each one are found inside the manifest directory.
+
+Debugging
+
+To make packstack write more detailed information into the log file you can use the -d switch:
+
+$ packstack -d --allinone
diff --git a/docs/packstack.rst b/docs/packstack.rst
index 3b40c992c..f0d3de05f 100644
--- a/docs/packstack.rst
+++ b/docs/packstack.rst
@@ -214,6 +214,24 @@ Nagios Config parameters
 
 **CONFIG_NAGIOS_PW**           : The password of the nagiosadmin user on the Nagios server
 
+Log files and Debug info
+------------------------
+
+The location of the log files and generated puppet manifests are in the /var/tmp/packstack directory under a directory named by the date in which packstack was run and a random string (e.g. /var/tmp/packstack/20131022-204316-Bf3Ek2). Inside, we find a manifest directory and the openstack-setup.log file; puppet manifests and a log file for each one are found inside the manifest directory.
+
+In case debugging info is needed while running packstack the -d switch will make it write more detailed information about the installation.
+
+Examples:
+
+If we need an allinone debug session:
+
+packstack -d --allinone
+
+If we need a answer file to tailor it and then debug:
+
+packstack --gen-answer-file=ans.txt
+packstack -d --answer-file=ans.txt
+
 
 SOURCE
 ======