diff --git a/config.php b/includes/config.php
similarity index 100%
rename from config.php
rename to includes/config.php
diff --git a/includes/dbconnect.php b/includes/dbconnect.php
new file mode 100644
index 0000000..4c4550c
--- /dev/null
+++ b/includes/dbconnect.php
@@ -0,0 +1,11 @@
+<?php
+
+// Connect to MySQL database
+$link = mysql_connect($host, $user, $password)
+    or die("Could not connect...");
+
+mysql_select_db($database)
+    or die("Could not open database");
+
+
+?>
diff --git a/index.php b/index.php
index fde24a0..4d57df9 100644
--- a/index.php
+++ b/index.php
@@ -1,14 +1,9 @@
 <?php
 
-// Include config file
-require "config.php";
+// Include config file and other include-files
+require "includes/config.php";
+require "includes/dbconnect.php";
 
-// Connect to MySQL database
-$link = mysql_connect($host, $user, $password)
-    or die("Could not connect...");
-
-mysql_select_db($database)
-    or die("Could not open database");
 
 // Divide the posts into pages, N number of posts on every page
 if (isset($_GET["page"]))
diff --git a/user/createpost.php b/user/createpost.php
index 3f685fa..b7617e4 100644
--- a/user/createpost.php
+++ b/user/createpost.php
@@ -1,14 +1,8 @@
 <?php
 
 // Include config file
-require "../config.php";
-
-// Connect to MySQL database
-$link = mysql_connect($host, $user, $password)
-    or die("Could not connect...");
-
-mysql_select_db($database)
-    or die("Could not open database");
+require "../includes/config.php";
+require "../includes/dbconnect.php";
 
 
 $query = "INSERT INTO blog (date, title, posttext) VALUES
diff --git a/user/editpost.html b/user/editpost.html
new file mode 100644
index 0000000..dbb3070
--- /dev/null
+++ b/user/editpost.html
@@ -0,0 +1,14 @@
+<html><title>Edit post</title>
+<body>
+
+<form action="editpost.php" method="get">
+Date: (YYYY-MM-DD) <input type="date" name="date">
+<br />
+Title: <input type="text" name="title">
+<br />
+<input type="submit" value="Find post">
+</form>
+
+
+</body>
+</html>
diff --git a/user/editpost.php b/user/editpost.php
new file mode 100644
index 0000000..036dcfc
--- /dev/null
+++ b/user/editpost.php
@@ -0,0 +1,36 @@
+<?php
+
+// Include config file
+require "../includes/config.php";
+require "../includes/dbconnect.php";
+
+
+$query = "SELECT * FROM blog WHERE date='$_GET[date]' AND title='$_GET[title]'";
+$result = mysql_query($query)
+    or die("No matching queries...");
+
+
+// Printing posts in HTML
+while ($line = mysql_fetch_array($result))
+{
+print "
+<form action='updatepost.php' method='post'>
+Post number: <input type='text' name='postnumber' value='$line[postnumber]' readonly><br />
+Date: (YYYY-MM-DD) <input type='date' name='date' value='$line[date]'>
+<br />
+Title: <input type='text' name='title' value='$line[title]'>
+<br /><br />
+Text: <br />
+<textarea cols='50' rows='10' name='post'>$line[posttext]</textarea>
+<br />
+<input type='submit' value='Update post'>
+</form>";
+}
+
+
+// Close MySQL link
+mysql_free_result($result);
+mysql_close($link);
+
+
+?>
diff --git a/user/newpost.html b/user/newpost.html
index 27297ad..7a9710b 100644
--- a/user/newpost.html
+++ b/user/newpost.html
@@ -9,7 +9,7 @@ Title: <input type="text" name="title">
 Text: <br />
 <textarea cols="50" rows="10" name="post"></textarea>
 <br />
-<input type="submit">
+<input type="submit" value="Create post">
 </form>
 
 </body>
diff --git a/user/updatepost.php b/user/updatepost.php
new file mode 100644
index 0000000..ed25efe
--- /dev/null
+++ b/user/updatepost.php
@@ -0,0 +1,22 @@
+<?php
+
+// Include config file
+require "../includes/config.php";
+require "../includes/dbconnect.php";
+
+
+$query = "UPDATE blog SET date='$_POST[date]', title='$_POST[title]',
+posttext='$_POST[post]' WHERE postnumber='$_POST[postnumber]'";
+
+if (!mysql_query($query))
+{
+	die ("Something went wrong!");
+}
+print "Post updated";
+
+
+// Close MySQL link
+mysql_close($link);
+
+
+?>
