diff --git a/lib/bind/cua.bind b/lib/bind/cua.bind
index 9f1b65c879..71d501d77c 100644
--- a/lib/bind/cua.bind
+++ b/lib/bind/cua.bind
@@ -43,8 +43,12 @@
 \bind "C-p"			"dialog-show print"
 \bind "C-d"			"buffer-view dvi"	# 'd' for dvi
 \bind "C-t"			"buffer-view ps"
+\bind "C-M-t"			"master-buffer-view ps"
+\bind "C-M-d"			"master-buffer-view dvi"
 \bind "C-S-D"			"buffer-update dvi"	# 'd' for dvi
 \bind "C-S-T"			"buffer-update ps"
+\bind "C-M-S-t"			"master-buffer-update ps"
+\bind "C-M-S-d"			"master-buffer-update dvi"
 \bind "C-q"			"lyx-quit"
 \bind "C-Next"			"buffer-next"
 \bind "C-Tab"			"buffer-next"
diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index e228d7edd6..69f265b377 100644
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -128,6 +128,8 @@ void LyXAction::init()
 		{ LFUN_BUFFER_TOGGLE_READ_ONLY, "buffer-toggle-read-only", ReadOnly },
 		{ LFUN_BUFFER_UPDATE, "buffer-update", ReadOnly },
 		{ LFUN_BUFFER_VIEW, "buffer-view", ReadOnly },
+		{ LFUN_MASTER_BUFFER_UPDATE, "master-buffer-update", ReadOnly },
+		{ LFUN_MASTER_BUFFER_VIEW, "master-buffer-view", ReadOnly },
 		{ LFUN_BUFFER_WRITE, "buffer-write", ReadOnly },
 		{ LFUN_BUFFER_WRITE_AS, "buffer-write-as", ReadOnly },
 		{ LFUN_BUFFER_WRITE_ALL, "buffer-write-all", ReadOnly },
diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index e724ed0c78..569ae86972 100644
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -678,6 +678,8 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 	case LFUN_BUFFER_WRITE_AS:
 	case LFUN_BUFFER_UPDATE:
 	case LFUN_BUFFER_VIEW:
+	case LFUN_MASTER_BUFFER_UPDATE:
+	case LFUN_MASTER_BUFFER_VIEW:
 	case LFUN_BUFFER_IMPORT:
 	case LFUN_BUFFER_AUTO_SAVE:
 	case LFUN_RECONFIGURE:
@@ -978,6 +980,16 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			Exporter::preview(lyx_view_->buffer(), argument);
 			break;
 
+		case LFUN_MASTER_BUFFER_UPDATE:
+			BOOST_ASSERT(lyx_view_ && lyx_view_->buffer() && lyx_view_->buffer()->getMasterBuffer());
+			Exporter::Export(lyx_view_->buffer()->getMasterBuffer(), argument, true);
+			break;
+
+		case LFUN_MASTER_BUFFER_VIEW:
+			BOOST_ASSERT(lyx_view_ && lyx_view_->buffer() && lyx_view_->buffer()->getMasterBuffer());
+			Exporter::preview(lyx_view_->buffer()->getMasterBuffer(), argument);
+			break;
+
 		case LFUN_BUILD_PROGRAM:
 			BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
 			Exporter::Export(lyx_view_->buffer(), "program", true);
diff --git a/src/lfuns.h b/src/lfuns.h
index ffa316921b..73cf3f0562 100644
--- a/src/lfuns.h
+++ b/src/lfuns.h
@@ -379,8 +379,11 @@ enum kb_action {
 	LFUN_LISTING_INSERT,             // Herbert 20011110, bpeng 20070502
 	LFUN_TOOLBAR_TOGGLE,             // Edwin 20070521
 	LFUN_BUFFER_WRITE_ALL,           // rgh, gpothier 200707XX
-	//290
+	// 290
 	LFUN_PARAGRAPH_PARAMS,           // rgh, 200708XX
+	LFUN_MASTER_BUFFER_VIEW,	 // Tommaso
+	// 295
+	LFUN_MASTER_BUFFER_UPDATE,	 // Tommaso
 
 	LFUN_LASTACTION                  // end of the table
 };
diff --git a/status.15x b/status.15x
index 706b2625cd..55747e1f07 100644
--- a/status.15x
+++ b/status.15x
@@ -75,6 +75,11 @@ What's new
   bugs were fixed and some new styles were added (bugs 4087, 4223).
   Cf. http://wiki.lyx.org/Layouts/AMS for a detailed list of changes.
 
+- New LyX functions, master-buffer-view and master-buffer-update, have
+  been added, to view the master buffer associated with a given child
+  buffer. These are bound by default to C-M-t and C-M-d, for Postscript
+  and DVI, respectively, for view, and to C-M-S-t and C-M-S-d, for update.
+
 
 ** Bug fixes:
 *************