diff --git a/src/SongPosition.cpp b/src/SongPosition.cpp
index c3e6c30ffc..60c5587016 100644
--- a/src/SongPosition.cpp
+++ b/src/SongPosition.cpp
@@ -1,12 +1,3 @@
-/*
- *  SongPosition.cpp
- *  stepmania
- *
- *  Created by [Full Username] on 5/10/11.
- *  Copyright 2011 [Organization Name]. All rights reserved.
- *
- */
-
 #include "SongPosition.h"
 
 void SongPosition::UpdateSongPosition( float fPositionSeconds, const TimingData &timing, const RageTimer &timestamp )
@@ -61,3 +52,31 @@ void SongPosition::UpdateSongPosition( float fPositionSeconds, const TimingData
 
 
 }
+
+/**
+ * @file
+ * @author Thai Pangsakulyanont (c) 2011
+ * @section LICENSE
+ * All rights reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons to
+ * whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+ * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
+ * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
diff --git a/src/SongPosition.h b/src/SongPosition.h
index 8890e3a87d..1e4226ef84 100644
--- a/src/SongPosition.h
+++ b/src/SongPosition.h
@@ -43,7 +43,7 @@ class SongPosition
 
 /**
  * @file
- * @author Chris Danford, Glenn Maynard (c) 2001-2004
+ * @author Thai Pangsakulyanont (c) 2011
  * @section LICENSE
  * All rights reserved.
  *