diff --git a/templates/console-full/.gitignore b/templates/console-full/.gitignore
index f7d69f670f81719982eac883f956ba204a4116ba..3e3ef75f6fd93bf4510a62f9da2c0dd2824d57da 100644
--- a/templates/console-full/.gitignore
+++ b/templates/console-full/.gitignore
@@ -2,9 +2,10 @@
 .buildlog
 .packages
 .project
-.pub/
-build/
-**/packages/
+.pub
+build
+packages
+pubspec.lock # (Remove this pattern if you wish to check in your lock file)
 
 # Files created by dart2js
 *.dart.js
diff --git a/templates/package-simple/.gitignore b/templates/package-simple/.gitignore
index a425549abd2e8c03172ede6bcd879eb4bc31496f..8f462e3086933c04326a6282e77f4e673b786c01 100644
--- a/templates/package-simple/.gitignore
+++ b/templates/package-simple/.gitignore
@@ -2,9 +2,10 @@
 .buildlog
 .packages
 .project
-.pub/
-build/
-**/packages/
+.pub
+build
+packages
+pubspec.lock
 
 # Files created by dart2js
 *.dart.js
@@ -16,9 +17,6 @@ build/
 # Directory created by dartdoc
 doc/api/
 
-# This is a library package, so ignore pub lock file
-pubspec.lock
-
 # JetBrains IDEs (WebStorm and IDEA are the recomended Dart IDEs) 
 .idea/
 *.iml
diff --git a/templates/server-appengine/.gitignore b/templates/server-appengine/.gitignore
index f7d69f670f81719982eac883f956ba204a4116ba..3e3ef75f6fd93bf4510a62f9da2c0dd2824d57da 100644
--- a/templates/server-appengine/.gitignore
+++ b/templates/server-appengine/.gitignore
@@ -2,9 +2,10 @@
 .buildlog
 .packages
 .project
-.pub/
-build/
-**/packages/
+.pub
+build
+packages
+pubspec.lock # (Remove this pattern if you wish to check in your lock file)
 
 # Files created by dart2js
 *.dart.js
diff --git a/templates/server-shelf/.gitignore b/templates/server-shelf/.gitignore
index f7d69f670f81719982eac883f956ba204a4116ba..3e3ef75f6fd93bf4510a62f9da2c0dd2824d57da 100644
--- a/templates/server-shelf/.gitignore
+++ b/templates/server-shelf/.gitignore
@@ -2,9 +2,10 @@
 .buildlog
 .packages
 .project
-.pub/
-build/
-**/packages/
+.pub
+build
+packages
+pubspec.lock # (Remove this pattern if you wish to check in your lock file)
 
 # Files created by dart2js
 *.dart.js
diff --git a/templates/web-polymer/.gitignore b/templates/web-polymer/.gitignore
index f7d69f670f81719982eac883f956ba204a4116ba..3e3ef75f6fd93bf4510a62f9da2c0dd2824d57da 100644
--- a/templates/web-polymer/.gitignore
+++ b/templates/web-polymer/.gitignore
@@ -2,9 +2,10 @@
 .buildlog
 .packages
 .project
-.pub/
-build/
-**/packages/
+.pub
+build
+packages
+pubspec.lock # (Remove this pattern if you wish to check in your lock file)
 
 # Files created by dart2js
 *.dart.js
diff --git a/templates/web-simple/.gitignore b/templates/web-simple/.gitignore
index f7d69f670f81719982eac883f956ba204a4116ba..3e3ef75f6fd93bf4510a62f9da2c0dd2824d57da 100644
--- a/templates/web-simple/.gitignore
+++ b/templates/web-simple/.gitignore
@@ -2,9 +2,10 @@
 .buildlog
 .packages
 .project
-.pub/
-build/
-**/packages/
+.pub
+build
+packages
+pubspec.lock # (Remove this pattern if you wish to check in your lock file)
 
 # Files created by dart2js
 *.dart.js