diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index af8ceb3..8a195d9 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -263,7 +263,7 @@
                     String key = res.getStringArray(R.array.hikeEntriesKeys)[position];
                     if(key.equals(getString(R.string.hike_title_record_key))) {
                         if(hikeHandler.isRecording()) {
-                            ArrayList<HikePoint> hikePoints = (ArrayList) hikeHandler.getPoints();
+                            final ArrayList<HikePoint> hikePoints = (ArrayList) hikeHandler.getPoints();
                             if(hikePoints.size() < 2) return;
 
                             LayoutInflater inflater = getLayoutInflater();
@@ -291,7 +291,10 @@
                                             if(!name.equals("")) {
                                                 hikeHandler.stopRecording();
                                                 view.setText(hikeEntries[position]);
-                                                poiHandler.addPoi(new Hike(0, hikeHandler.getLength(), hikeHandler.getTime(), 0, name, "You", System.currentTimeMillis(), 0));
+                                                long hikeId = poiHandler.addPoi(new Hike(0, hikeHandler.getLength(), hikeHandler.getTime(), 0, name, "You", System.currentTimeMillis(), 0));
+                                                for(HikePoint hp : hikePoints) {
+                                                    poiHandler.addGp(new DbGeoPoint(hp.getLocation(), System.currentTimeMillis(), hikeId, Types.HIKE));
+                                                }
                                             }
                                         }
                                     })
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/DbGeoPoint.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/DbGeoPoint.java
index 50aa534..c3c56cf 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/DbGeoPoint.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/DbGeoPoint.java
@@ -51,6 +51,14 @@
         this(0, aLatitude, aLongitude, aAltitude, _time, _poiId, _poiType);
     }
 
+    public DbGeoPoint(GeoPoint gp, long time, long _poiId, int _poiType) {
+        this(gp.getLatitude(), gp.getLongitude(), gp.getAltitude(), time, _poiId, _poiType);
+    }
+
+    public DbGeoPoint(long id, GeoPoint gp, long time, long _poiId, int _poiType) {
+        this(id, gp.getLatitude(), gp.getLongitude(), gp.getAltitude(), time, _poiId, _poiType);
+    }
+
     public DbGeoPoint(long id, double lat, double lon, double alt, long time, long _poiId, int _poiType){
         super(id, Types.GP);
         this.lat = lat;