--- fbreader-0.12.10/fbreader/src/formats/fb2/FB2BookReader.cpp.orig	2014-02-10 17:46:17.384066700 +0100
+++ fbreader-0.12.10/fbreader/src/formats/fb2/FB2BookReader.cpp	2014-02-10 17:46:29.333896500 +0100
@@ -66,7 +66,7 @@
 		myModelReader.addHyperlinkLabel(id);
 	}
 	switch (tag) {
-		case _P:
+		case _PP:
 			if (mySectionStarted) {
 				mySectionStarted = false;
 			} else if (myInsideTitle) {
@@ -228,7 +228,7 @@
 
 void FB2BookReader::endElementHandler(int tag) {
 	switch (tag) {
-		case _P:
+		case _PP:
 			myModelReader.endParagraph();
 			break;
 		case _V:
--- fbreader-0.12.10/fbreader/src/formats/fb2/FB2Reader.cpp.orig	2014-02-10 17:46:36.400832400 +0100
+++ fbreader-0.12.10/fbreader/src/formats/fb2/FB2Reader.cpp	2014-02-10 17:46:45.683010900 +0100
@@ -34,7 +34,7 @@
 }
 
 static const FB2Reader::Tag TAGS[] = {
-	{"p", FB2Reader::_P},
+	{"p", FB2Reader::_PP},
 	{"subtitle", FB2Reader::_SUBTITLE},
 	{"cite", FB2Reader::_CITE},
 	{"text-author", FB2Reader::_TEXT_AUTHOR},
--- fbreader-0.12.10/fbreader/src/formats/fb2/FB2Reader.h.orig	2014-02-10 17:45:38.387115500 +0100
+++ fbreader-0.12.10/fbreader/src/formats/fb2/FB2Reader.h	2014-02-10 17:45:51.055559200 +0100
@@ -48,7 +48,7 @@
 
 public:
 	enum TagCode {
-		_P,
+		_PP,
 		_SUBTITLE,
 		_CITE,
 		_TEXT_AUTHOR,
--- fbreader-0.12.10/fbreader/src/library/Library.cpp.orig	2014-02-10 17:57:11.208355800 +0100
+++ fbreader-0.12.10/fbreader/src/library/Library.cpp	2014-02-10 17:57:28.280041400 +0100
@@ -39,7 +39,7 @@
 shared_ptr<Library> Library::ourInstance;
 const size_t Library::MaxRecentListSize = 10;
 
-Library::Library &Library::Instance() {
+Library &Library::Instance() {
 	if (ourInstance.isNull()) {
 		ourInstance = new Library();
 	}
--- fbreader-0.12.10/zlibrary/core/src/filesystem/ZLInputStreamDecorator.cpp.orig	2014-02-10 17:58:31.556886200 +0100
+++ fbreader-0.12.10/zlibrary/core/src/filesystem/ZLInputStreamDecorator.cpp	2014-02-10 17:58:53.257599000 +0100
@@ -24,6 +24,7 @@
 
 bool ZLInputStreamDecorator::open() {
 	bool result = myBaseStream->open();
+	if (result)
 	myBaseOffset = myBaseStream->offset();
 	return result;
 }
--- fbreader-0.12.10/zlibrary/text/Makefile.orig	2014-02-10 18:09:16.673068700 +0100
+++ fbreader-0.12.10/zlibrary/text/Makefile	2014-02-10 18:09:34.176717500 +0100
@@ -34,8 +34,8 @@
 	@echo -n 'Creating $@ ...'
 	@$(RM_QUIET) $(TARGET)
 ifeq "$(ZLSHARED)" "yes"
-	@$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(CORE_LIBS) -llinebreak -lfribidi
-	#@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(CORE_LIBS) $(EXTERNAL_LIBS) -llinebreak -lfribidi
+	@$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(CORE_LIBS) -lunibreak -lfribidi
+	#@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(CORE_LIBS) $(EXTERNAL_LIBS) -lunibreak -lfribidi
 	@ln -sf $(TARGET) $(TARGET_SONAME)
 	@ln -sf $(TARGET) $(TARGET_SHORTNAME)
 else