diff --git a/core/audio.cpp b/core/audio.cpp
index 8c8c6735..662decd0 100644
--- a/core/audio.cpp
+++ b/core/audio.cpp
@@ -100,7 +100,7 @@ void audio :: pause()
 		cur_driver->pause();
 }
 
-void audio :: seek_to(long pos)
+void audio :: seek_to(int64_t pos)
 {
 	if (cur_track)
 		cur_driver->seek_to(pos);
diff --git a/gui/gst.cpp b/gui/gst.cpp
index f2de2fde..7b61fc54 100644
--- a/gui/gst.cpp
+++ b/gui/gst.cpp
@@ -97,7 +97,7 @@ public:
 		return state == GST_STATE_PLAYING;
 	}
 
-	void seek_to(long offset)
+	void seek_to(int64_t offset)
 	{
 		gst_element_seek_simple(gst_player,
 					GST_FORMAT_TIME,
diff --git a/include/core/audio.h b/include/core/audio.h
index 414f7f70..dc032ccd 100644
--- a/include/core/audio.h
+++ b/include/core/audio.h
@@ -53,7 +53,7 @@ public:
 	 *
 	 * @param  offset  Position from the beginning of the track where we will seek to, in nanoseconds.
 	 */
-	virtual void seek_to(long offset) = 0;
+	virtual void seek_to(int64_t offset) = 0;
 
 	/**
 	 * Return the current position of the playback.
@@ -91,7 +91,7 @@ namespace audio
 	 *
 	 * @param  pos  Offset (in nanoseconds) from the beginning of the track.
 	 */
-	void seek_to(long);
+	void seek_to(int64_t);
 
 	/**
 	 * Stop playback and seek to the beginning of the track.
diff --git a/tests/core/audio.cpp b/tests/core/audio.cpp
index f8eb9954..14a0deb6 100644
--- a/tests/core/audio.cpp
+++ b/tests/core/audio.cpp
@@ -32,7 +32,7 @@ public:
 
 	bool is_playing() { return playing; }
 
-	void seek_to(long offset) { cur_pos = offset; }
+	void seek_to(int64_t offset) { cur_pos = offset; }
 	int64_t position() { return cur_pos;      }
 	int64_t duration() { return cur_duration; }
 };