diff --git a/libarmbox/playback_libeplayer3.cpp b/libarmbox/playback_libeplayer3.cpp
index 21eac91..3d1872c 100644
--- a/libarmbox/playback_libeplayer3.cpp
+++ b/libarmbox/playback_libeplayer3.cpp
@@ -591,7 +591,6 @@ void cPlayback::GetChapters(std::vector<int> &positions, std::vector<std::string
 {
 	positions.clear();
 	titles.clear();
-	/*
 	    if(player && player->manager && player->manager->chapter) {
 	        char ** TrackList = NULL;
 	        player->manager->chapter->Command(player, MANAGER_LIST, &TrackList);
@@ -610,7 +609,6 @@ void cPlayback::GetChapters(std::vector<int> &positions, std::vector<std::string
 	            free(TrackList);
 	        }
 	    }
-	*/
 }
 
 void cPlayback::GetMetadata(std::vector<std::string> &keys, std::vector<std::string> &values)
diff --git a/libeplayer3-arm/Makefile.am b/libeplayer3-arm/Makefile.am
index ceeea65..b3f06aa 100644
--- a/libeplayer3-arm/Makefile.am
+++ b/libeplayer3-arm/Makefile.am
@@ -15,6 +15,7 @@ libeplayer3_arm_la_SOURCES = \
 	manager/audio.c \
 	manager/video.c \
 	manager/subtitle.c \
+	manager/chapter.c \
 	output/linuxdvb_mipsel.c \
 	output/output_subtitle.c \
 	output/output.c \
diff --git a/libeplayer3-arm/include/manager.h b/libeplayer3-arm/include/manager.h
index cbca287..450e9d1 100644
--- a/libeplayer3-arm/include/manager.h
+++ b/libeplayer3-arm/include/manager.h
@@ -71,6 +71,8 @@ typedef struct Track_s
 	int                   inject_raw_pcm;
 
 	int                   pending;
+	long long int         chapter_start;
+	long long int         chapter_end;
 } Track_t;
 
 typedef struct TrackDescription_s
@@ -101,6 +103,7 @@ typedef struct ManagerHandler_s
 	Manager_t *audio;
 	Manager_t *video;
 	Manager_t *subtitle;
+    Manager_t *chapter;
 } ManagerHandler_t;
 
 void freeTrack(Track_t *track);
diff --git a/libeplayer3-arm/manager/manager.c b/libeplayer3-arm/manager/manager.c
index 00981e9..20ed602 100644
--- a/libeplayer3-arm/manager/manager.c
+++ b/libeplayer3-arm/manager/manager.c
@@ -40,13 +40,15 @@
 extern Manager_t AudioManager;
 extern Manager_t VideoManager;
 extern Manager_t SubtitleManager;
+extern Manager_t ChapterManager;
 
 ManagerHandler_t ManagerHandler =
 {
 	"ManagerHandler",
 	&AudioManager,
 	&VideoManager,
-	&SubtitleManager
+	&SubtitleManager,
+	&ChapterManager
 };
 
 /* ***************************** */