diff --git a/jOOQ-website/css/jooq.css b/jOOQ-website/css/jooq.css
index a4a031a3ba..ae15397a80 100644
--- a/jOOQ-website/css/jooq.css
+++ b/jOOQ-website/css/jooq.css
@@ -247,4 +247,8 @@ div.screenshot {
     white-space: pre-wrap;
     word-wrap: break-word;
 	text-align: center;
+}
+
+.mono {
+    font-family: monospace;
 }
\ No newline at end of file
diff --git a/jOOQ-website/frame.php b/jOOQ-website/frame.php
index 70b0984190..5c506f03c3 100644
--- a/jOOQ-website/frame.php
+++ b/jOOQ-website/frame.php
@@ -33,7 +33,7 @@
 			    		<a href="<?=$root?>/" title="jOOQ Home Page">Home</a>
 		    		</div>
 			    	<div class="navigation-item-left <?php if ($menu == 'tutorial') print 'navigation-item-active'?>">
-			    		<a href="<?=$root?>/tutorial.php" title="jOOQ Tutorial : The First Steps">Tutorial</a>
+			    		<a href="<?=$root?>/tutorial.php" title="jOOQ Tutorial : The First Steps">Tutorial & FAQ</a>
 			    	</div>
 			    	<div class="navigation-item-left <?php if ($menu == 'download') print 'navigation-item-active'?>">
 			    		<a href="https://sourceforge.net/projects/jooq/files/" title="jOOQ Download">Download</a>
diff --git a/jOOQ-website/index.php b/jOOQ-website/index.php
index 3daf9a5ef3..146f78e03d 100644
--- a/jOOQ-website/index.php
+++ b/jOOQ-website/index.php
@@ -68,20 +68,20 @@ create.select(FIRST_NAME, LAST_NAME, create.count())
 	</tr>
 </table>
       
-      <h2>What is jOOQ?</h2>
-      <p>jOOQ stands for Java Object Oriented Querying. It combines these essential features:</p>
+    <h2>What is jOOQ?</h2>
+    <p>jOOQ stands for Java Object Oriented Querying. It combines these essential features:</p>
       
-      <ul>
-      	<li>Code Generation: jOOQ generates a simple Java representation of your database schema. Every table, view, stored procedure, enum, UDT is a class.</li>
-		<li>Active records: jOOQ implements an easy-to-use active record pattern. It is NOT an OR-mapper, but provides a 1:1 mapping between tables/views and classes. Between columns and members.</li>
-        <li>Typesafe SQL: jOOQ allows for writing compile-time typesafe querying using its built-in fluent API.</li>
-        <li>SQL standard: jOOQ supports all standard SQL language features including the more complex UNION's, nested SELECTs, joins, aliasing</li>
-      	<li>Vendor-specific feature support: jOOQ encourages the use of vendor-specific extensions such as stored procedures, UDT's and ARRAY's, recursive queries, and many more.</li>
-      </ul>
+    <ul>
+    <li>Code Generation: jOOQ generates a simple Java representation of your database schema. Every table, view, stored procedure, enum, UDT is a class.</li>
+	<li>Active records: jOOQ implements an easy-to-use active record pattern. It is NOT an OR-mapper, but provides a 1:1 mapping between tables/views and classes. Between columns and members.</li>
+    <li>Typesafe SQL: jOOQ allows for writing compile-time typesafe querying using its built-in fluent API.</li>
+    <li>SQL standard: jOOQ supports all standard SQL language features including the more complex UNION's, nested SELECTs, joins, aliasing</li>
+    <li>Vendor-specific feature support: jOOQ encourages the use of vendor-specific extensions such as stored procedures, UDT's and ARRAY's, recursive queries, and many more.</li>
+    </ul>
       
-      <h2>How does jOOQ help you?</h2>
-      <ul>
-          <li>Your database always comes FIRST! That's where the schema is, not in your Java code or some XML mapping file.</li>
+    <h2>How does jOOQ help you?</h2>
+    <ul>
+    <li>Your database always comes FIRST! That's where the schema is, not in your Java code or some XML mapping file.</li>
     <li>Your schema is generated in Java. You can use auto-completion in your IDE!</li>
     <li>Your "value objects" or "data transfer objects" are generated too. This keeps things DRY</li>
     <li>Your Java code won't compile anymore when you modify your schema. That means less runtime errors.</li>
@@ -90,9 +90,9 @@ create.select(FIRST_NAME, LAST_NAME, create.count())
     <li>You won't have syntax errors in your query.</li>
     <li>You won't forget to bind variables correctly. No SQL injection, either.</li>
     <li>You can forget about JDBC's verbosity (especially useful when dealing with UDTs, ARRAYs and stored procedures). </li>
-</ul>
-<h3>Or in short:</h3>
-<ul>
+    </ul>
+    <h3>Or in short:</h3>
+    <ul>
     <li>You can be productive again!</li>
     </ul>
     
diff --git a/jOOQ-website/tutorial.php b/jOOQ-website/tutorial.php
index 9c9b1ae5d1..35deb2935c 100644
--- a/jOOQ-website/tutorial.php
+++ b/jOOQ-website/tutorial.php
@@ -24,6 +24,7 @@ Download and run jOOQ in 6 easy steps:
 	<li><a href="#step4">Step 4: Write a query using jOOQ's DSL</a></li>
 	<li><a href="#step5">Step 5: Iterate over results</a></li>
 	<li><a href="#step6">Step 6: Explore!</a></li>
+	<li><a href="#FAQ">FAQ</a></li>
 </ul>
 
 <h2 id="step0">Preparation: Download jOOQ and your SQL driver</h2>
@@ -353,6 +354,31 @@ jOOQ has grown to be a comprehensive SQL library. For more information, please c
   	<a href="http://ikaisays.com/2011/11/01/getting-started-with-jooq-a-tutorial/" target="_blank" title="Ikai Lan's jOOQ tutorial">http://ikaisays.com/2011/11/01/getting-started-with-jooq-a-tutorial/</a>
 </p>
 
+<h2 id="FAQ">FAQ</h2>
+<p>
+Before you go on and read the whole manual, there are a couple of interesting questions that you might want to consider:
+</p>
+
+<p>
+<b class="mono">Q:</b> When I generate source code from MySQL, can I also use it on another database?<br/>
+<b class="mono">A:</b> Yes! The generated Java code will work for all supported databases, not only for the database driver that you used when you generated the code.
+</p>
+	
+<p>    
+<b class="mono">Q:</b> When I generate source code from my developer database, can I also use it on production?<br/>
+<b class="mono">A:</b> Yes! You can map your schema at code generation time or at run time. <a href="http://www.jooq.org/manual/ADVANCED/SchemaMapping/" title="Schema mapping functionality in jOOQ">See the manual for details.</a>
+</p>
+
+<p>
+<b class="mono">Q:</b> Can I use jOOQ without code generation?<br/>
+<b class="mono">A:</b> Yes! You can define tables, fields, conditions using Strings. <a href="http://www.jooq.org/manual/DSL/SQL/" title="Plain SQL functionality in jOOQ">See the manual for details.</a>
+</p>
+
+<p>
+<b class="mono">Q:</b> Can I use jOOQ as a query builder and execute queries with Spring?<br/>
+<b class="mono">A:</b> Yes! This has been done by other users and will be documented soon. <a href="http://stackoverflow.com/questions/4474365/jooq-and-spring" title="Stack Overflow question about using jOOQ with Spring">See this Stack Overflow question for details.</a>
+</p>
+
 <?php 
 }
 ?>
\ No newline at end of file