diff --git a/hibernate/src/org/netbeans/modules/hibernate/hqleditor/ui/Bundle.properties b/hibernate/src/org/netbeans/modules/hibernate/hqleditor/ui/Bundle.properties
index ca06806e6d9f..b5344ae61f23 100644
--- a/hibernate/src/org/netbeans/modules/hibernate/hqleditor/ui/Bundle.properties
+++ b/hibernate/src/org/netbeans/modules/hibernate/hqleditor/ui/Bundle.properties
@@ -1,43 +1,19 @@
-
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
- 
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
- 
-# Contributor(s):
- 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_HQLEditorAction=Run HQL Query
diff --git a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateConfig.xml b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateConfig.xml
index b25bcd3014e1..f71fcae9384c 100644
--- a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateConfig.xml
+++ b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateConfig.xml
@@ -1,24 +1,4 @@
 <?xml version='1.0' encoding='utf-8'?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
 <!DOCTYPE hibernate-configuration PUBLIC
         "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
         "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
diff --git a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateMapping.xml b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateMapping.xml
index 29a322b0449a..2879d649bc9c 100644
--- a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateMapping.xml
+++ b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateMapping.xml
@@ -1,25 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-
 <!DOCTYPE hibernate-mapping PUBLIC
   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
diff --git a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateReveng.xml b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateReveng.xml
index 209d83dca3d3..8e0e4fbec894 100644
--- a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateReveng.xml
+++ b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateReveng.xml
@@ -1,25 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-
 <!DOCTYPE hibernate-reverse-engineering PUBLIC
   "-//Hibernate/Hibernate Reverse Engineering DTD 3.0//EN"
   "http://hibernate.sourceforge.net/hibernate-reverse-engineering-3.0.dtd">
diff --git a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax
index 67bbe3475b38..39a62640271d 100644
--- a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax
+++ b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax
@@ -1,21 +1,3 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 0e4bc6db61f1..a3c68eda054c 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -2050,6 +2050,8 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
             <exclude name="javafx2.editor/test/unit/data/goldenfiles/org/netbeans/modules/javafx2/editor/completion/impl/**/*.out*" />
             <exclude name="javawebstart/AntTasks/build/**" /> <!-- generated build files -->
             <exclude name="projectimport.eclipse.core/test/unit/data/**" /> <!--test data-->
+            <exclude name="hibernate/src/org/netbeans/modules/hibernate/resources/Hibernate*.xml" /> <!--template files-->
+            <exclude name="hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax" /> <!--template file-->
         </patternset>
         <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportfile="build/rat-report.txt">
             <rat:substringMatcher licenseFamilyCategory="w3c2" licenseFamilyName="W3C Software and Document Notice and License">