diff --git a/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java b/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
index a7cf9588e5..3259a9110a 100644
--- a/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
+++ b/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
@@ -32,7 +32,7 @@
 import org.hibernate.type.StandardBasicTypes;
 
 /**
- * A dialect for Microsoft SQL Server 2000 and 2005
+ * A dialect for Microsoft SQL Server 2000
  *
  * @author Gavin King
  */
diff --git a/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java b/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java
index 5d61dff205..82ba9d667e 100644
--- a/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java
+++ b/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java
@@ -38,6 +38,8 @@
 import org.hibernate.dialect.Ingres10Dialect;
 import org.hibernate.dialect.Ingres9Dialect;
 import org.hibernate.dialect.IngresDialect;
+import org.hibernate.dialect.SQLServer2005Dialect;
+import org.hibernate.dialect.SQLServer2008Dialect;
 import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.dialect.InformixDialect;
 import org.hibernate.dialect.DB2Dialect;
@@ -88,7 +90,6 @@ protected Dialect resolveDialectInternal(DatabaseMetaData metaData) throws SQLEx
                     }
                     return new IngresDialect();
                 case 10:
-                    log.warn( "Ingres " + databaseMajorVersion + " is not yet fully supported; using Ingres 9.3 dialect" );
                     return new Ingres10Dialect();
                 default:
                     log.warn( "Unknown Ingres major version [" + databaseMajorVersion + "] using Ingres 9.2 dialect" );
@@ -97,6 +98,16 @@ protected Dialect resolveDialectInternal(DatabaseMetaData metaData) throws SQLEx
 		}
 
 		if ( databaseName.startsWith( "Microsoft SQL Server" ) ) {
+			switch ( databaseMajorVersion ) {
+			case 8:
+				return new SQLServerDialect();
+			case 9:
+				return new SQLServer2005Dialect();
+			case 10:
+				return new SQLServer2008Dialect();
+			default:
+				log.warn( "Unknown Microsoft SQL Server major version [" + databaseMajorVersion + "] using SQL Server 2000 dialect" );
+			}
 			return new SQLServerDialect();
 		}
 
@@ -119,7 +130,6 @@ protected Dialect resolveDialectInternal(DatabaseMetaData metaData) throws SQLEx
 		if ( "Oracle".equals( databaseName ) ) {
 			switch ( databaseMajorVersion ) {
 				case 11:
-					log.warn( "Oracle 11g is not yet fully supported; using 10g dialect" );
 					return new Oracle10gDialect();
 				case 10:
 					return new Oracle10gDialect();