diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTemplate.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTemplate.cs
index ffb7938a..b7dbd982 100644
--- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTemplate.cs
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTemplate.cs
@@ -2246,10 +2246,7 @@ namespace Spring.Data.NHibernate
         public object DoInHibernate(ISession session)
         {
             outer.CheckWriteOperationAllowed(session);
-            // As of NH 3.1 SaveOrUpdateCopy is obsolete, disable compiler warning for now
-#pragma warning disable 618
             return session.SaveOrUpdateCopy(entity);
-#pragma warning restore 618
         }
     }
 
diff --git a/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.2008.csproj b/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.2008.csproj
index 890d81f0..346c2f73 100644
--- a/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.2008.csproj
+++ b/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.2008.csproj
@@ -21,8 +21,7 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>Spring.Data.NHibernate31.xml</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn>0618</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,6 +32,7 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>Spring.Data.NHibernate31.xml</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NoWarn>0618</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
diff --git a/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.2010.csproj b/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.2010.csproj
index 10ad4b7e..288d52e0 100644
--- a/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.2010.csproj
+++ b/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.2010.csproj
@@ -27,8 +27,7 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>Spring.Data.NHibernate31.xml</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn>0618</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -37,6 +36,9 @@
     <DefineConstants>TRACE;NET_2_0,NH_2_1</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>Spring.Data.NHibernate31.xml</DocumentationFile>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NoWarn>0618</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
diff --git a/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.build b/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.build
index 475d70fc..da246825 100644
--- a/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.build
+++ b/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.build
@@ -24,7 +24,7 @@
                      doc="${current.bin.dir}/${project::get-name()}.xml">
 			<arg line="${compiler.args}"/>
 			<nowarn>
-				<warning number="${nowarn.numbers.test},0169" />
+				<warning number="${nowarn.numbers.test},0169,0618" />
 				<warning number="0219" if="${nant.settings.currentframework=='mono-2.0'}"/>
 			</nowarn>
 			<sources failonempty="true">