diff --git a/Orchard.proj b/Orchard.proj
index fa15bf1a8..46de8c610 100644
--- a/Orchard.proj
+++ b/Orchard.proj
@@ -209,7 +209,7 @@
     <ItemGroup>
       <!--<MsDeploy-Folder-Input Include="$(StageFolder)\**\*" Exclude="$(StageFolder)\**\bin\**\*.pdb;$(StageFolder)\**\bin\**\*.xml" />-->
       <MsDeploy-Folder-Input Include="$(StageFolder)\**\*" Exclude="$(StageFolder)\**\bin\**\*.xml" />
-      <MsDeploy-Parameters Include="$(LibFolder)\msdeploy\*.xml"/>
+      <MsDeploy-Parameters Include="$(LibFolder)\msdeploy\*.xml;$(LibFolder)\msdeploy\*.sql"/>
     </ItemGroup>
 
     <Copy SourceFiles="@(MsDeploy-Folder-Input)"
diff --git a/lib/msdeploy/install.sql b/lib/msdeploy/install.sql
new file mode 100644
index 000000000..c998bcbfc
--- /dev/null
+++ b/lib/msdeploy/install.sql
@@ -0,0 +1,45 @@
+/**********************************************************************/
+/* Install.SQL                                                        */
+/* Creates a login and makes the user a member of db roles            */
+/*                                                                    */
+/**********************************************************************/
+
+-- Declare variables for database name, username and password
+DECLARE @dbName sysname,
+      @dbUser sysname,
+      @dbPwd nvarchar(max);
+
+-- Set variables for database name, username and password
+SET @dbName = 'PlaceHolderForDb';
+SET @dbUser = 'PlaceHolderForUser';
+SET @dbPwd = 'PlaceHolderForPassword';
+
+DECLARE @cmd nvarchar(max)
+
+-- Create login
+IF( SUSER_SID(@dbUser) is null )
+BEGIN
+    print '-- Creating login '
+    SET @cmd = N'CREATE LOGIN ' + quotename(@dbUser) + N' WITH PASSWORD ='''+ replace(@dbPwd, '''', '''''') + N''''
+    EXEC(@cmd)
+END
+
+-- Create database user and map to login
+-- and add user to the datareader, datawriter, ddladmin and securityadmin roles
+--
+SET @cmd = N'USE ' + quotename(@DBName) + N'; 
+IF( NOT EXISTS (SELECT * FROM sys.database_principals WHERE name = ''' + replace(@dbUser, '''', '''''') + N'''))
+BEGIN
+    print ''-- Creating user'';
+    CREATE USER ' + quotename(@dbUser) + N' FOR LOGIN ' + quotename(@dbUser) + N';
+    print ''-- Adding user'';
+    EXEC sp_addrolemember ''db_ddladmin'', ''' + replace(@dbUser, '''', '''''') + N''';
+    print ''-- Adding user'';
+    EXEC sp_addrolemember ''db_securityadmin'', ''' + replace(@dbUser, '''', '''''') + N''';
+    print ''-- Adding user'';
+    EXEC sp_addrolemember ''db_datareader'', ''' + replace(@dbUser, '''', '''''') + N''';
+    print ''-- Adding user'';
+    EXEC sp_addrolemember ''db_datawriter'', ''' + replace(@dbUser, '''', '''''') + N''';
+END'
+EXEC(@cmd)
+GO
\ No newline at end of file
diff --git a/lib/msdeploy/manifest.xml b/lib/msdeploy/manifest.xml
index 8b507fe20..7b714369a 100644
--- a/lib/msdeploy/manifest.xml
+++ b/lib/msdeploy/manifest.xml
@@ -2,4 +2,7 @@
 	<iisapp path="Orchard" managedRuntimeVersion="v4.0" />
 	<setAcl path="Orchard/App_Data" setAclAccess="Modify" />
 	<setAcl path="Orchard/Media" setAclAccess="Modify" />
+	<setAcl path="Orchard/Modules" setAclAccess="Modify" />
+	<setAcl path="Orchard/Themes" setAclAccess="Modify" />
+	<dbFullSql path="install.sql" />
 </MSDeploy.iisApp>
diff --git a/lib/msdeploy/parameters.xml b/lib/msdeploy/parameters.xml
index 0253c8c6b..4b7acb8b8 100644
--- a/lib/msdeploy/parameters.xml
+++ b/lib/msdeploy/parameters.xml
@@ -1,15 +1,77 @@
 <parameters>
-
+	<!-- Prompts where to copy the content files and takes a web site path (such as "contoso.com/app") -->
 	<parameter name="Application Path" description="Full site path where you would like to install your application (i.e., Default Web Site/orchard)" defaultValue="Default Web Site/orchard" tags="iisapp">
 		<parameterEntry type="ProviderPath" scope="iisapp" match="Orchard" />
 	</parameter>
 
-	<parameter name="SetAclParameter1" description="Hidden - automatically sets write access for the app" defaultValue="{Application Path}/App_Data" tags="Hidden, NoDatabase">
+	<!-- This is the parameter that is used to set ACLs, it's set to the application path filled in by the user -->
+	<parameter name="SetAclParameter1" description="Hidden - automatically sets write access for the app" defaultValue="{Application Path}/App_Data" tags="Hidden">
 		<parameterEntry type="ProviderPath" scope="setAcl" match="Orchard/App_Data" /> 
 	</parameter>
 
-	<parameter name="SetAclParameter2" description="Hidden - automatically sets write access for the app" defaultValue="{Application Path}/Media" tags="Hidden, NoDatabase">
+	<parameter name="SetAclParameter2" description="Hidden - automatically sets write access for the app" defaultValue="{Application Path}/Media" tags="Hidden">
 		<parameterEntry type="ProviderPath" scope="setAcl" match="Orchard/Media" /> 
 	</parameter>
 
-</parameters>
+	<parameter name="SetAclParameter3" description="Hidden - automatically sets write access for the app" defaultValue="{Application Path}/Modules" tags="Hidden">
+		<parameterEntry type="ProviderPath" scope="setAcl" match="Orchard/Modules" /> 
+	</parameter>
+
+	<parameter name="SetAclParameter4" description="Hidden - automatically sets write access for the app" defaultValue="{Application Path}/Themes" tags="Hidden">
+		<parameterEntry type="ProviderPath" scope="setAcl" match="Orchard/Themes" /> 
+	</parameter>
+
+   	<!-- Prompts for database server name, this is used in the connection string parameter later -->
+	<parameter name="Database Server" description="Location of your database server (i.e. server name, IP address, or server\instance)" defaultValue=".\SQLEXPRESS" tags="SQL, dbServer">
+	</parameter>
+
+	<!-- Prompts for the database name and fills it into the database scripts -->
+	<parameter name="Database Name" description="Name of the database for Orchard." defaultValue="orchard" tags="SQL, dbName">
+		<parameterEntry type="TextFile" scope="install.sql" match="PlaceHolderForDb" />
+	</parameter>	
+
+    <!-- Prompts for the database username and fills it into the database scripts.
+	The SQL tag indicates it is a parameter required for SQL, the DbUsername tag indicates this is a Db username -->
+	<parameter name="Database Username" description="User name to access you application database." defaultValue="orcharduser" tags="SQL, DbUsername">
+		<parameterEntry type="TextFile" scope="install.sql" match="PlaceHolderForUser" />
+	</parameter>
+
+    <!-- Prompts for the database password and fills it into the database scripts.
+	The SQL tag indicates it is a parameter required for SQL, the DbUserPassword tag indicates this is a Db password -->
+	<parameter name="Database Password" description="Password for the Database Username." tags="New, Password, SQL, DbUserPassword">
+		<parameterEntry type="TextFile" scope="install.sql" match="PlaceHolderForPassword" />
+	</parameter>
+
+	<!-- Prompts for the admin creds and uses it for the administrator connection string. This is used to create a login and assign permissions. 
+        The SQL tag indicates it is a parameter required for SQL. The DbAdminUsername tag indicates it should be used when the user is creating a new database. 
+        If they're not, it can be filled in with the DbUsername value. -->
+	<parameter name="Database Administrator" description="Administrator user name for your database  This is used to create the database and user if the don't already exist." defaultValue="sa" tags="SQL, dbAdminUsername">
+	</parameter>
+
+	<!-- Prompts for the admin password and uses it for the administrator connection string.  
+        This is use to create a login and assign permissions. The SQL tag indicates it is a parameter required for SQL. 
+        The DbAdminPassword tag indicates it should be used when the user is creating a new database. If they're not, it can be filled in with the DbUserPassword value. -->
+	<parameter name="Database Administrator Password" description="Password for the database administrator account." tags="New, Password, SQL, dbAdminPassword">
+	</parameter>
+	
+	<!-- This is the hidden admin connection string used to run the database scripts -->
+	<parameter name="Connection String" description="Automatically sets the connection string for the connection request." defaultValue="Server={Database Server};Database={Database Name};uid={Database Administrator};Pwd={Database Administrator Password};" tags="Hidden, SQL">
+		<parameterEntry type="ProviderPath" scope="dbfullsql" match="install.sql" />
+	</parameter>
+
+        <parameter name="Settings Data Provider for SQL" description="Orchard SQL Data Provider Setting" defaultValue="DataProvider: SqlServer" tags="Hidden, SQL">
+               <parameterEntry kind="TextFile" scope="\\Settings\.txt$" match="DataProvider\s*:[^\r\n]*" />
+        </parameter>
+
+        <parameter name="Settings Data Connection String for SQL" description="Orchard SQL Data Connection String Setting" defaultValue="DataConnectionString: Server={Database Server};Database={Database Name};uid={Database Administrator};Pwd={Database Administrator Password};" tags="Hidden, SQL">
+               <parameterEntry kind="TextFile" scope="\\Settings\.txt$" match="DataConnectionString\s*:[^\r\n]*" />
+        </parameter>
+
+        <parameter name="Settings Data Provider for SQLCE" description="Orchard SQLCE Data Provider Setting" defaultValue="DataProvider: SqlCe" tags="Hidden, SQLCE, NoStore">
+               <parameterEntry kind="TextFile" scope="\\Settings\.txt$" match="DataProvider\s*:[^\r\n]*" />
+        </parameter>
+
+        <parameter name="Settings Data Connection String for SQLCE" description="Orchard SQLCE Data Connection String Setting" defaultValue="DataConnectionString: " tags="Hidden, SQLCE, NoStore">
+               <parameterEntry kind="TextFile" scope="\\Settings\.txt$" match="DataConnectionString\s*:[^\r\n]*" />
+        </parameter>	
+</parameters>
\ No newline at end of file