diff --git a/.gitattributes b/.gitattributes
index fd650bc6ca..767c39899c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -579,7 +579,7 @@ components/compilers/javascript/examples/ReadJSClassesXML.lpr svneol=native#text
 components/compilers/javascript/examples/jsclassxmlread.pas svneol=native#text/plain
 components/custom/README.txt svneol=native#text/plain
 components/customdrawn/customdrawn.lpk svneol=native#text/plain
-components/customdrawn/customdrawncontrols.pas svneol=native#text/plain
+components/customdrawn/customdrawnextras.pas svneol=native#text/plain
 components/customform/custforms.pp svneol=native#text/plain
 components/customform/demo/appform.pas svneol=native#text/plain
 components/customform/demo/appforms.lpk svneol=native#text/plain
diff --git a/components/customdrawn/customdrawn.lpk b/components/customdrawn/customdrawn.lpk
index dbe12f569f..27d154657a 100644
--- a/components/customdrawn/customdrawn.lpk
+++ b/components/customdrawn/customdrawn.lpk
@@ -4,25 +4,20 @@
     <PathDelim Value="\"/>
     <Name Value="customdrawn"/>
     <CompilerOptions>
-      <Version Value="8"/>
+      <Version Value="9"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
-      <Parsing>
-        <SyntaxOptions>
-          <UseAnsiStrings Value="True"/>
-        </SyntaxOptions>
-      </Parsing>
       <Other>
         <CompilerPath Value="$(CompPath)"/>
       </Other>
     </CompilerOptions>
     <Files Count="1">
       <Item1>
-        <Filename Value="customdrawncontrols.pas"/>
+        <Filename Value="customdrawnextras.pas"/>
         <HasRegisterProc Value="True"/>
-        <UnitName Value="customdrawncontrols"/>
+        <UnitName Value="customdrawnextras"/>
       </Item1>
     </Files>
     <Type Value="RunAndDesignTime"/>
diff --git a/components/customdrawn/customdrawncontrols.pas b/components/customdrawn/customdrawnextras.pas
similarity index 99%
rename from components/customdrawn/customdrawncontrols.pas
rename to components/customdrawn/customdrawnextras.pas
index 0eda2e7a0c..78f1ab3a1a 100644
--- a/components/customdrawn/customdrawncontrols.pas
+++ b/components/customdrawn/customdrawnextras.pas
@@ -7,7 +7,7 @@
   such as a custom drawn version of TButton, of TEdit, of TPageControl, etc,
   eventually forming a full set of custom drawn components.
 }
-unit customdrawncontrols;
+unit customdrawnextras;
 
 {$mode objfpc}{$H+}