diff --git a/progit/app.py b/progit/app.py
index 27af8c1..d1a9b53 100644
--- a/progit/app.py
+++ b/progit/app.py
@@ -157,10 +157,13 @@ def new_project():
 def view_repo(repo):
     """ Front page of a specific repo.
     """
-    reponame = os.path.join(APP.config['GIT_FOLDER'], repo)
-    if not os.path.exists(reponame):
+    repo = progit.lib.get_project(SESSION, repo)
+
+    if repo is None:
         flask.abort(404)
-    repo_obj = pygit2.Repository(reponame)
+
+    repo_obj = pygit2.Repository(os.path.join(APP.config["GIT_FOLDER"],
+                                 repo.path))
 
     cnt = 0
     last_commits = []
diff --git a/progit/lib.py b/progit/lib.py
index a91e2ef..dc780a3 100644
--- a/progit/lib.py
+++ b/progit/lib.py
@@ -95,3 +95,7 @@ def list_projects(session, start=None, limit=None):
 def count_projects(session):
     """Count the number of projects in the database"""
     return session.query(model.Project).count()
+
+def get_project(session, name):
+    """Get a project from the database"""
+    return session.query(model.Project).filter_by(name=name).first()
diff --git a/progit/templates/repo_info.html b/progit/templates/repo_info.html
index cf109a6..4a48847 100644
--- a/progit/templates/repo_info.html
+++ b/progit/templates/repo_info.html
@@ -1,17 +1,17 @@
 {% extends "master.html" %}
 
-{% block title %}{{ repo }}{% endblock %}
+{% block title %}{{ repo.name }}{% endblock %}
 {%block tag %}home{% endblock %}
 
 
 {% block content %}
 <h2>
   {% if '/fork/' in request.url %}
-  <a href="{{ url_for('view_fork_repo', username=username, repo=repo)}}">
+  <a href="{{ url_for('view_fork_repo', username=username, repo=repo.name)}}">
   {% else %}
-  <a href="{{ url_for('view_repo', repo=repo)}}">
+  <a href="{{ url_for('view_repo', repo=repo.name)}}">
   {% endif %}
-    {{ repo.split('.git')[0] }}
+    {{ repo.name }}
   </a>
   {% if branchname %} ({{ branchname }}) {% endif %}
 </h2>
@@ -24,19 +24,19 @@
     <li>
       {% if '/fork/' in request.url %}
         <a href="{{ url_for('view_fork_repo_branch',
-                  username=username, repo=repo, branchname=branch) }}">
+                  username=username, repo=repo.name, branchname=branch) }}">
       {% else %}
       <a href="{{ url_for('view_repo_branch',
-                  repo=repo, branchname=branch) }}">
+                  repo=repo.name, branchname=branch) }}">
       {% endif %}
         {{ branch }}
       </a>
       {% if '/fork/' in request.url %}
         (<a href="{{ url_for('view_fork_log', username=username,
-                   repo=repo, branchname=branch) }}">logs</a>)
+                   repo=repo.name, branchname=branch) }}">logs</a>)
       {% else %}
         (<a href="{{ url_for('view_log',
-                   repo=repo, branchname=branch) }}">logs</a>)
+                   repo=repo.name, branchname=branch) }}">logs</a>)
       {% endif %}
 
     </li>
@@ -50,7 +50,7 @@
         <td>
         {% if page > 1%}
             <a href="{{ url_for('.%s' % origin,
-                        repo=repo) }}?page={{page - 1}}">
+                        repo=repo.name) }}?page={{page - 1}}">
                 &lt; Previous
             </a>
         {% else %}
@@ -61,7 +61,7 @@
         <td>
             {% if page < total_page %}
             <a href="{{ url_for('.%s' % origin,
-                        repo=repo) }}?page={{page + 1}}">
+                        repo=repo.name) }}?page={{page + 1}}">
                 Next &gt;
             </a>
             {% else %}
@@ -83,10 +83,10 @@
     <li>
         {% if '/fork/' in request.url %}
           <a href="{{ url_for('view_fork_commit', username=username,
-                  repo=repo, commitid=commit.hex) }}">
+                  repo=repo.name, commitid=commit.hex) }}">
         {% else %}
           <a href="{{ url_for('view_commit',
-                  repo=repo, commitid=commit.hex) }}">
+                  repo=repo.name, commitid=commit.hex) }}">
         {% endif %}
 
         {{ commit.hex[:6] }}
@@ -108,10 +108,10 @@
         {% endif %}
         {% if '/fork/' in request.url %}
           <a href="{{ url_for('view_fork_file', username=username,
-                    repo=repo, identifier=branchname, filename=entry.name) }}">
+                    repo=repo.name, identifier=branchname, filename=entry.name) }}">
         {% else %}
           <a href="{{ url_for('view_file',
-                    repo=repo, identifier=branchname, filename=entry.name) }}">
+                    repo=repo.name, identifier=branchname, filename=entry.name) }}">
         {% endif %}
           {{ entry.name }}
         </a>