diff --git a/std/StandardToken b/std/StandardToken.sol
similarity index 98%
rename from std/StandardToken
rename to std/StandardToken.sol
index a83b599f4..25d0bd388 100644
--- a/std/StandardToken
+++ b/std/StandardToken.sol
@@ -1,4 +1,4 @@
-import "./Token";
+import "./Token.sol";
 
 contract StandardToken is Token {
 	uint256 tokenSupply;
diff --git a/std/Token b/std/Token.sol
similarity index 100%
rename from std/Token
rename to std/Token.sol
diff --git a/std/mortal b/std/mortal.sol
similarity index 84%
rename from std/mortal
rename to std/mortal.sol
index b32e8a348..8de019abb 100644
--- a/std/mortal
+++ b/std/mortal.sol
@@ -1,4 +1,4 @@
-import "./owned";
+import "./owned.sol";
 
 contract mortal is owned {
     function kill() {
diff --git a/std/owned b/std/owned.sol
similarity index 100%
rename from std/owned
rename to std/owned.sol
diff --git a/std/std b/std/std
deleted file mode 100644
index d5ce157e8..000000000
--- a/std/std
+++ /dev/null
@@ -1,4 +0,0 @@
-import "./owned";
-import "./mortal";
-import "./Token";
-import "./StandardToken";
diff --git a/std/std.sol b/std/std.sol
new file mode 100644
index 000000000..c3f66b1b7
--- /dev/null
+++ b/std/std.sol
@@ -0,0 +1,4 @@
+import "./owned.sol";
+import "./mortal.sol";
+import "./Token.sol";
+import "./StandardToken.sol";