diff --git a/src/java/org/apache/poi/hpsf/DocumentSummaryInformation.java b/src/java/org/apache/poi/hpsf/DocumentSummaryInformation.java
index 6fc7799ea1..73d185340b 100644
--- a/src/java/org/apache/poi/hpsf/DocumentSummaryInformation.java
+++ b/src/java/org/apache/poi/hpsf/DocumentSummaryInformation.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/HPSFException.java b/src/java/org/apache/poi/hpsf/HPSFException.java
index def7fe902d..7461fef9ea 100644
--- a/src/java/org/apache/poi/hpsf/HPSFException.java
+++ b/src/java/org/apache/poi/hpsf/HPSFException.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java b/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java
index cf11517da3..c84b2e50f3 100644
--- a/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java
+++ b/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/MarkUnsupportedException.java b/src/java/org/apache/poi/hpsf/MarkUnsupportedException.java
index 27cf0b8060..7dc153e7d3 100644
--- a/src/java/org/apache/poi/hpsf/MarkUnsupportedException.java
+++ b/src/java/org/apache/poi/hpsf/MarkUnsupportedException.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/NoPropertySetStreamException.java b/src/java/org/apache/poi/hpsf/NoPropertySetStreamException.java
index 2a7d33138a..e52b3068c8 100644
--- a/src/java/org/apache/poi/hpsf/NoPropertySetStreamException.java
+++ b/src/java/org/apache/poi/hpsf/NoPropertySetStreamException.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/NoSingleSectionException.java b/src/java/org/apache/poi/hpsf/NoSingleSectionException.java
index 78ba3f3706..d8c37a8526 100644
--- a/src/java/org/apache/poi/hpsf/NoSingleSectionException.java
+++ b/src/java/org/apache/poi/hpsf/NoSingleSectionException.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/Property.java b/src/java/org/apache/poi/hpsf/Property.java
index c38b85eaae..20e149fd46 100644
--- a/src/java/org/apache/poi/hpsf/Property.java
+++ b/src/java/org/apache/poi/hpsf/Property.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/PropertySet.java b/src/java/org/apache/poi/hpsf/PropertySet.java
index 55e0102185..ad1a0cd000 100644
--- a/src/java/org/apache/poi/hpsf/PropertySet.java
+++ b/src/java/org/apache/poi/hpsf/PropertySet.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/PropertySetFactory.java b/src/java/org/apache/poi/hpsf/PropertySetFactory.java
index fb36f2c9c9..cc7a3e8bf9 100644
--- a/src/java/org/apache/poi/hpsf/PropertySetFactory.java
+++ b/src/java/org/apache/poi/hpsf/PropertySetFactory.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/Section.java b/src/java/org/apache/poi/hpsf/Section.java
index 63b6bb5bbd..39c4b11dab 100644
--- a/src/java/org/apache/poi/hpsf/Section.java
+++ b/src/java/org/apache/poi/hpsf/Section.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/SpecialPropertySet.java b/src/java/org/apache/poi/hpsf/SpecialPropertySet.java
index f8970bc155..8044a1170c 100644
--- a/src/java/org/apache/poi/hpsf/SpecialPropertySet.java
+++ b/src/java/org/apache/poi/hpsf/SpecialPropertySet.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java b/src/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java
index 955a69729b..1c297fb4d0 100644
--- a/src/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java
+++ b/src/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/Util.java b/src/java/org/apache/poi/hpsf/Util.java
index 28ae09d91b..9bcdba5d73 100644
--- a/src/java/org/apache/poi/hpsf/Util.java
+++ b/src/java/org/apache/poi/hpsf/Util.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/Variant.java b/src/java/org/apache/poi/hpsf/Variant.java
index 9d1b796b85..be17579fe1 100644
--- a/src/java/org/apache/poi/hpsf/Variant.java
+++ b/src/java/org/apache/poi/hpsf/Variant.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/littleendian/Byte.java b/src/java/org/apache/poi/hpsf/littleendian/Byte.java
index 05c9cf6869..262043cd7b 100644
--- a/src/java/org/apache/poi/hpsf/littleendian/Byte.java
+++ b/src/java/org/apache/poi/hpsf/littleendian/Byte.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/littleendian/ClassID.java b/src/java/org/apache/poi/hpsf/littleendian/ClassID.java
index 5a5d8135a3..8adc8ea40b 100644
--- a/src/java/org/apache/poi/hpsf/littleendian/ClassID.java
+++ b/src/java/org/apache/poi/hpsf/littleendian/ClassID.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/littleendian/DWord.java b/src/java/org/apache/poi/hpsf/littleendian/DWord.java
index 353e4a5722..2a7fb34dce 100644
--- a/src/java/org/apache/poi/hpsf/littleendian/DWord.java
+++ b/src/java/org/apache/poi/hpsf/littleendian/DWord.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/littleendian/LittleEndian.java b/src/java/org/apache/poi/hpsf/littleendian/LittleEndian.java
index 289ca88246..0fb6beec0c 100644
--- a/src/java/org/apache/poi/hpsf/littleendian/LittleEndian.java
+++ b/src/java/org/apache/poi/hpsf/littleendian/LittleEndian.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/littleendian/Word.java b/src/java/org/apache/poi/hpsf/littleendian/Word.java
index 384ab4a313..7919b0a43c 100644
--- a/src/java/org/apache/poi/hpsf/littleendian/Word.java
+++ b/src/java/org/apache/poi/hpsf/littleendian/Word.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java b/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
index d2501888fb..74ebbbe859 100644
--- a/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
+++ b/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
diff --git a/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java b/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java
index f3b893686c..d42df09bf3 100644
--- a/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java
+++ b/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java
@@ -50,6 +50,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* .
+*
+* Portions of this software are based upon public domain software
+* originally written at the National Center for Supercomputing Applications,
+* University of Illinois, Urbana-Champaign.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,